Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Thu, 2 Feb 2012 15:03:03 +0000 (17:03 +0200)
committerPetri Lehtinen <petri@digip.org>
Thu, 2 Feb 2012 15:03:03 +0000 (17:03 +0200)

Trivial merge