From: Ed Page <eopage@byu.net>
Date: Sat, 18 Dec 2010 15:02:30 +0000 (-0600)
Subject: Merge branch 'master' into qt
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=47a05297a0ba7fa3de6bade5667e468085c7d659;p=gc-dialer

Merge branch 'master' into qt
---

47a05297a0ba7fa3de6bade5667e468085c7d659