Merge heads
authorPetri Lehtinen <petri@digip.org>
Sat, 12 Nov 2011 19:23:46 +0000 (21:23 +0200)
committerPetri Lehtinen <petri@digip.org>
Sat, 12 Nov 2011 19:24:37 +0000 (21:24 +0200)

Trivial merge