[Xnee/el6: 3/3] Merge branch 'master' into el6

[fantom]

commit ec2668b6790a06cfe3bafe3534453c5e79c78852
Merge: a35453b 93d225e
Author: Matthieu Saulnier <fantom at fedoraproject.org>
Date:   Thu Jun 21 19:01:32 2012 +0200

    Merge branch 'master' into el6

 Xnee.spec |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---