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

Trivial merge