Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Mon, 30 Jan 2012 19:23:49 +0000 (21:23 +0200)
committerPetri Lehtinen <petri@digip.org>
Mon, 30 Jan 2012 19:23:49 +0000 (21:23 +0200)

Trivial merge