[lightdm/f17: 2/2] Merge branch 'f16' into f17

[brummbq]

commit a9664c54973a63886f42d6f8d69759a8a6530706
Merge: 72ee6a3 b6c7ed2
Author: Gregor Tätzner <gregor at freenet.de>
Date:   Sun Jul 15 20:22:22 2012 +0200

    Merge branch 'f16' into f17

 lightdm.spec |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---