[etckeeper/f12/master: 6/6] Merge branch 'master' into f12

[Thomas Moschny]

commit 2b02e9db630b6db6fb4ce64be0839e7ebd30b92b
Merge: d149a31 24ac181
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Tue Sep 7 09:27:51 2010 +0200

    Merge branch 'master' into f12

 .gitignore                    |    1 +
 etckeeper-0.48-fix_path.patch |   45 +++++++++++++++++++++++++++++++++++++++++
 etckeeper.spec                |   16 +++++++++++--
 sources                       |    2 +-
 4 files changed, 60 insertions(+), 4 deletions(-)
---