Merge branch '1.2'
authorPetri Lehtinen <petri@digip.org>
Sat, 12 Jun 2010 19:44:21 +0000 (22:44 +0300)
committerPetri Lehtinen <petri@digip.org>
Sat, 12 Jun 2010 19:45:45 +0000 (22:45 +0300)

Trivial merge