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

[Thomas Moschny]

commit e9355424fd3e6d01c85c205a5c5830e9c8c71d02
Merge: dc19110 a4fb2ae
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Fri Sep 17 00:46:53 2010 +0200

    Merge branch 'master' into el6

 etckeeper.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---