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

[Michel Alexandre Salim]

commit de4c4434a24a83447593737d9bde22553b6b3365
Merge: 7b2a637 395d502
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sat Nov 6 21:01:04 2010 +0100

    Merge branch 'master' into f13

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