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

[mjg]

commit 5fd73f1e373014fbb84b09d7721671d8d40e639a
Merge: 192708f 117d9e8
Author: Michael J Gruber <mjg at fedoraproject.org>
Date:   Tue Aug 16 08:01:03 2011 +0200

    Merge branch 'master' into f14

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