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

[Thomas Moschny]

commit 3f0922202d0b1eae98e8b9f8994b5bf1037ae0c6
Merge: e935542 7a174a4
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Wed Oct 27 10:06:54 2010 +0200

    Merge branch 'master' into el6

 .gitignore     |    1 +
 etckeeper.spec |   10 +++++++---
 sources        |    2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
---