[luci/f14: 6/6] Merge branch 'f15' into f14

[Ryan McCabe]

commit eee05befb152e8bdefee5e23347f2ba30417b699
Merge: cd0c82f 6cb5ce8
Author: Ryan McCabe <rmccabe at redhat.com>
Date:   Tue Aug 2 22:46:38 2011 -0400

    Merge branch 'f15' into f14

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