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

[Thomas Moschny]

commit e1138e707ea1b5ef933de16f761319542ebc21bd
Merge: 6083c40 cae2492
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Thu Jun 2 15:34:23 2011 +0200

    Merge branch 'master' into el6

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