Merge branch '1.2'
authorPetri Lehtinen <petri@digip.org>
Thu, 28 Jan 2010 19:05:19 +0000 (21:05 +0200)
committerPetri Lehtinen <petri@digip.org>
Thu, 28 Jan 2010 19:05:19 +0000 (21:05 +0200)

Trivial merge