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

[Thomas Moschny]

commit e0d5426789e1ede8953e600c790346d78320cb0e
Merge: 3f09222 965a3da
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Mon Jan 3 13:36:54 2011 +0100

    Merge branch 'master' into el6

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