Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Wed, 6 Jun 2012 18:10:28 +0000 (21:10 +0300)
committerPetri Lehtinen <petri@digip.org>
Wed, 6 Jun 2012 18:10:28 +0000 (21:10 +0300)

Trivial merge