Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Thu, 26 Apr 2012 19:11:22 +0000 (22:11 +0300)
committerPetri Lehtinen <petri@digip.org>
Thu, 26 Apr 2012 19:11:22 +0000 (22:11 +0300)

Trivial merge