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

[fantom]

commit 15cf61da408dafe897d83601d43f227dc14591ff
Merge: ec2668b 4900a90
Author: Matthieu Saulnier <fantom at fedoraproject.org>
Date:   Thu Jun 21 19:27:18 2012 +0200

    Merge branch 'master' into el6

 .gitignore |    1 +
 sources    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---