[nickle/el6/master: 7/7] Merge branch 'master' into el6

[Michel Alexandre Salim]

commit b3e9b2bea54411070d88d554849e2530bd7f2228
Merge: 0a567ff b8059bd
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sat Mar 12 17:15:28 2011 +0100

    Merge branch 'master' into el6

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