Merge branch '2.0'
authorPetri Lehtinen <petri@digip.org>
Thu, 31 Mar 2011 13:39:33 +0000 (16:39 +0300)
committerPetri Lehtinen <petri@digip.org>
Thu, 31 Mar 2011 13:39:33 +0000 (16:39 +0300)

Trivial merge