[xnoise/el6/master: 6/6] Merge branch 'master' into el6

[Michel Alexandre Salim]

commit cc5acaf2c8659b4acf0b1eb48410e0b6f78685a5
Merge: 715798c 395d502
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sat Nov 6 21:03:14 2010 +0100

    Merge branch 'master' into el6

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