From: Robert Ancell <robert.ancell@canonical.com>
Date: Thu, 14 Mar 2013 22:43:51 +0000 (+1300)
Subject: Merge with trunk
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/sojka/lightdm.git/commitdiff_plain/271412e9c11932761f781eb2bb8ce95a15fad1d5

Merge with trunk
---

271412e9c11932761f781eb2bb8ce95a15fad1d5