Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Thu, 26 Apr 2012 06:00:49 +0000 (09:00 +0300)
committerPetri Lehtinen <petri@digip.org>
Thu, 26 Apr 2012 06:00:49 +0000 (09:00 +0300)

Trivial merge