From: Travis Reitter <treitter@gmail.com>
Date: Fri, 4 Dec 2009 06:01:45 +0000 (-0800)
Subject: Merge local development branch
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=4acb64750b428f966d3d054384cae4eb0fcbf5ae;p=milk

Merge local development branch
---

4acb64750b428f966d3d054384cae4eb0fcbf5ae