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

[Michel Alexandre Salim]

commit 5c8a033c4882a9b8cfce78c318fffd4b78464085
Merge: 9f06c96 b8059bd
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sat Mar 12 17:11:12 2011 +0100

    Merge branch 'master' into f13

 .gitignore  |    2 +-
 nickle.spec |   12 +++++++++---
 sources     |    2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)
---