[luci/f14/master: 2/2] Merge branch 'master' into f14

[Fabio M. Di Nitto]

commit 93fd46b461cbc141a9361924490bf730b155e372
Merge: 47685af f3ea824
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Thu Aug 19 15:58:23 2010 +0200

    Merge branch 'master' into f14

 .gitignore            |    2 +
 luci.spec             |  189 ++++++++++-
 sources               |    3 +-
 stolen_from_git.patch |  854 +++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 1033 insertions(+), 15 deletions(-)
---