[nickle/el5: 4/4] Merge branch 'f16' into el5

[Michel Alexandre Salim]

commit cf2e829b698beaa9a4048a366bab99a36a69a1ce
Merge: 3ff5f86 e390799
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sat Feb 4 17:50:16 2012 +0100

    Merge branch 'f16' into el5

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