From: Lance Colton <lance.colton@gmail.com>
Date: Sat, 14 Jan 2012 10:12:41 +0000 (-0700)
Subject: Merge branch 'master' of drop.maemo.org:/git/monky
X-Git-Url: http://vcs.maemo.org/git/?p=monky;a=commitdiff_plain;h=9bd2e3ea012b14764c0ef6ca2297667215f80d0f

Merge branch 'master' of drop.maemo.org:/git/monky
---

9bd2e3ea012b14764c0ef6ca2297667215f80d0f