[etckeeper/el6: 2/2] Merge branch 'master' into el6

[Thomas Moschny]

commit 189575609387aef1f1089a6758fdd9894b1aef10
Merge: e1138e7 8fe63e5
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Tue Jun 28 19:10:08 2011 +0200

    Merge branch 'master' into el6

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