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

[Thomas Moschny]

commit 782ffb8488de39bc9a117e02076041791a6cad20
Merge: 60c21ab eb1d695
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Wed Sep 15 21:46:01 2010 +0200

    Merge branch 'master' into f13

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