Merge branch '2.2'
authorPetri Lehtinen <petri@digip.org>
Mon, 14 Nov 2011 19:16:42 +0000 (21:16 +0200)
committerPetri Lehtinen <petri@digip.org>
Mon, 14 Nov 2011 19:16:42 +0000 (21:16 +0200)

Trivial merge