Merge branch '2.3'
authorPetri Lehtinen <petri@digip.org>
Fri, 27 Jul 2012 04:28:40 +0000 (07:28 +0300)
committerPetri Lehtinen <petri@digip.org>
Fri, 27 Jul 2012 04:28:40 +0000 (07:28 +0300)

Trivial merge