Merge branch 'dev-0.2'
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>
Thu, 21 Feb 2013 17:38:56 +0000 (19:38 +0200)
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>
Thu, 21 Feb 2013 17:38:56 +0000 (19:38 +0200)

Trivial merge