Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Thu, 22 Mar 2012 07:02:51 +0000 (09:02 +0200)
committerPetri Lehtinen <petri@digip.org>
Thu, 22 Mar 2012 07:02:51 +0000 (09:02 +0200)

Trivial merge