[nickle/el5/master: 20/20] Merge branch 'el6' into el5

[Michel Alexandre Salim]

commit c8f8e0b13d08ce97c1b626ba09e898f24842eee3
Merge: c06b327 b3e9b2b
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sat Mar 12 17:21:48 2011 +0100

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    	nickle.spec
    	sources

 .gitignore  |    2 +-
 nickle.spec |   23 ++++++++++++++++++++++-
 sources     |    2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)
---