[filelight/f17: 2/2] Merge branch 'f18' into f17

[Than Ngo]

commit 307aaf80080800fd05874a86311b6cb7dd0820e2
Merge: b8d9a08 06af323
Author: Than Ngo <than at redhat.com>
Date:   Fri Dec 7 10:33:31 2012 +0100

    Merge branch 'f18' into f17

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