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

[fantom]

commit 96db392e6d36e343c144e64b0ebcc086e4565f12
Merge: ae4ab4a c608ae5
Author: Casper <casper at Blackbird.(none)>
Date:   Mon Dec 12 12:22:12 2011 +0100

    Merge branch 'master' into el6

 .gitignore |    1 +
 Xnee.spec  |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---