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

[Thomas Moschny]

commit 4f05868a593c5ca6b18de36b04a1f2d50d4130d3
Merge: 90f90f6 c027a44
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Thu Mar 31 23:29:26 2011 +0200

    Merge branch 'master' into f13

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