[luci/f15: 3/3] Merge branch 'master' into f15

[Ryan McCabe]

commit 6cb5ce8a4d04d52a70e5d83659a867a7da7dd9b2
Merge: 33f5f58 8c693c8
Author: Ryan McCabe <rmccabe at redhat.com>
Date:   Tue Aug 2 22:46:00 2011 -0400

    Merge branch 'master' into f15

 .gitignore |    1 +
 luci.spec  |   13 ++++++++-----
 sources    |    2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
---