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

[Thomas Moschny]

commit dc1911039c447396e6f0effd3fa54e273ad02ccc
Merge: 2b02e9d eb1d695
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Wed Sep 15 21:47:01 2010 +0200

    Merge branch 'master' into f12

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