[filelight/f17: 7/7] Merge branch 'master' into f17

[Than Ngo]

commit 8bf99f01f5cb13e64fa502138f04a12c92861898
Merge: 2929af4 8375dbc
Author: Than Ngo <than at redhat.com>
Date:   Thu Mar 7 14:52:55 2013 +0100

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	filelight.spec
    	sources

 .gitignore     |    1 +
 filelight.spec |   21 ++++++++++++++++++---
 sources        |    2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 908b209,9fa467f..a8e281c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,7 @@@
 +/filelight-4.8.5.tar.xz
 +/filelight-4.9.1.tar.xz
 +/filelight-4.9.2.tar.xz
 +/filelight-4.9.3.tar.xz
 +/filelight-4.9.4.tar.xz
 +/filelight-4.9.5.tar.xz
+ /filelight-4.10.1.tar.xz