[luci/f13/master: 4/4] Merge branch 'master' into f13

[Fabio M. Di Nitto]

commit 83becbc9b890d1c02056b30a58ce4c2a7fb92477
Merge: 93cc51a d744cf3
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Fri Apr 15 09:11:08 2011 +0200

    Merge branch 'master' into f13
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>

 .gitignore |    3 ---
 luci.spec  |   20 +++++++++++++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)
---