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

[Thomas Moschny]

commit 6083c40249035749295af7683fa1e361c9c61f95
Merge: 42a4f1c c027a44
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Thu Mar 31 23:38:29 2011 +0200

    Merge branch 'master' into el6

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