Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Sun, 11 Mar 2012 19:16:41 +0000 (21:16 +0200)
committerPetri Lehtinen <petri@digip.org>
Sun, 11 Mar 2012 19:16:41 +0000 (21:16 +0200)

Trivial merge