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

Trivial merge