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

[Thomas Moschny]

commit ce1d35a6c4930daed2924dbd9580f976a7c3ed6c
Merge: 782ffb8 7a174a4
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Wed Oct 27 09:11:27 2010 +0200

    Merge branch 'master' into f13

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