[nickle/el5/master: 2/2] Merge branch 'master' into el5

[Michel Alexandre Salim]

commit 3ff5f863e66947f4d8e232eeab78a9f687a64c5a
Merge: c8f8e0b a381645
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sat Mar 12 18:20:40 2011 +0100

    Merge branch 'master' into el5

 nickle.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---