Merge branch '2.0'
authorPetri Lehtinen <petri@digip.org>
Tue, 5 Apr 2011 12:38:37 +0000 (15:38 +0300)
committerPetri Lehtinen <petri@digip.org>
Tue, 5 Apr 2011 12:38:37 +0000 (15:38 +0300)

Trivial merge