[luckybackup/f14/master: 7/7] Merge branch 'master' into f14

[mjg]

commit 192708f083c51d541ff1d0edf513eec58a8fc45a
Merge: f3763e9 b325b2e
Author: Michael J Gruber <mjg at fedoraproject.org>
Date:   Thu Mar 10 17:28:26 2011 +0100

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	luckybackup.spec
    	sources
    
    Resolving with master versions - conflicts were due to unnecessary
    forking.

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