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

[fantom]

commit 168a1ef6c376a0394571ec4008a2fa05bb442f59
Merge: e788c38 f590d97
Author: Casper <casper at Blackbird.(none)>
Date:   Thu Nov 24 21:49:43 2011 +0100

    Merge branch 'master' into el6

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