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

[Thomas Moschny]

commit e53e0aa18428dede590ff9ffe48ac95e53b2af54
Merge: 1895756 448e48d
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Thu Jul 21 18:24:52 2011 +0200

    Merge branch 'master' into el6

 .gitignore     |    1 +
 etckeeper.spec |    5 ++++-
 sources        |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---