[etckeeper/f13: 3/3] Merge branch 'master' into f13

[Thomas Moschny]

commit 1254d87db1aa411ebe1fe57aacfef83b695858b5
Merge: 4f05868 cae2492
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Thu Jun 2 15:32:33 2011 +0200

    Merge branch 'master' into f13

 .gitignore               |    1 +
 etckeeper-0.54-yum.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 etckeeper.spec           |   10 +++++++++-
 sources                  |    2 +-
 4 files changed, 51 insertions(+), 2 deletions(-)
---