Merge branch 'master' of drop.maemo.org:/git/monky
authorLance Colton <lance.colton@gmail.com>
Sat, 14 Jan 2012 10:12:41 +0000 (03:12 -0700)
committerLance Colton <lance.colton@gmail.com>
Sat, 14 Jan 2012 10:12:41 +0000 (03:12 -0700)

Trivial merge