Merge branch '1.2'
authorPetri Lehtinen <petri@digip.org>
Fri, 7 May 2010 04:36:01 +0000 (07:36 +0300)
committerPetri Lehtinen <petri@digip.org>
Fri, 7 May 2010 04:36:01 +0000 (07:36 +0300)

Trivial merge