Merge branch '1.3'
authorPetri Lehtinen <petri@digip.org>
Mon, 6 Sep 2010 17:48:25 +0000 (20:48 +0300)
committerPetri Lehtinen <petri@digip.org>
Mon, 6 Sep 2010 17:48:25 +0000 (20:48 +0300)

Trivial merge