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

[Thomas Moschny]

commit 4e27d2af46818717303034636cced642937d83ac
Merge: 296c468 66170d8
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Thu Dec 1 15:34:23 2011 +0100

    Merge branch 'master' into el6

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