[xfce4-session/f15: 2/2] Merge branch 'master' into f15

[Christoph Wickert]

commit e4a9d8bb639ca8eb778403e6d71edc306d5bf61c
Merge: a33417b 5845900
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Tue Sep 13 23:59:47 2011 +0200

    Merge branch 'master' into f15

 .gitignore         |    1 +
 sources            |    2 +-
 xfce4-session.spec |   13 ++++++-------
 3 files changed, 8 insertions(+), 8 deletions(-)
---