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

[fantom]

commit 9d8037eef0244f2f3d42dda4158c2c2da83b1ea4
Merge: 40795bd bc402ed
Author: Casper <casper at Blackbird.(none)>
Date:   Tue Nov 22 18:49:40 2011 +0100

    Merge branch 'master' into el6

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