[xnoise/f13/master: 7/7] Merge branch 'el6' into f13

[Michel Alexandre Salim]

commit 4b2ba4e38102f44b083f82c88b53030f15531def
Merge: de4c443 943f181
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sat Nov 6 21:19:06 2010 +0100

    Merge branch 'el6' into f13

 .gitignore  |    2 +-
 sources     |    2 +-
 xnoise.spec |   41 ++++++++++-------------------------------
 3 files changed, 12 insertions(+), 33 deletions(-)
---