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

[fantom]

commit e788c381657417ae8f8c869df5632d18c72fd2ac
Merge: 9d8037e 9ef33a1
Author: Casper <casper at Blackbird.(none)>
Date:   Thu Nov 24 18:40:30 2011 +0100

    Merge branch 'master' into el6

 .gitignore |    1 +
 Xnee.spec  |   14 +++++++-------
 sources    |    2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)
---