Merge branch '2.0'
authorPetri Lehtinen <petri@digip.org>
Thu, 21 Apr 2011 10:15:58 +0000 (13:15 +0300)
committerPetri Lehtinen <petri@digip.org>
Thu, 21 Apr 2011 10:15:58 +0000 (13:15 +0300)

Trivial merge