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

[Kevin Fenzi]

commit a33417b7679189c6cccd97d759fa7fdac1113072
Merge: c12be5e 66e0e22
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Wed Jul 27 16:51:38 2011 -0600

    Merge remote-tracking branch 'origin/master' into f15

 xfce4-session-4.8.1-hostname.patch |   29 +++++++++++++++++++++++++++++
 xfce4-session.spec                 |   10 ++++++++--
 2 files changed, 37 insertions(+), 2 deletions(-)
---