Merge branch '2.0'
authorPetri Lehtinen <petri@digip.org>
Sun, 27 Mar 2011 18:04:29 +0000 (21:04 +0300)
committerPetri Lehtinen <petri@digip.org>
Sun, 27 Mar 2011 18:04:29 +0000 (21:04 +0300)

Trivial merge