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

[Thomas Moschny]

commit 60c21ab571aceafbdaebf576716cd7afaa06f3f3
Merge: 8dcbe17 24ac181
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Tue Sep 7 09:02:13 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore                    |    1 +
 etckeeper-0.48-fix_path.patch |   45 +++++++++++++++++++++++++++++++++++++++++
 etckeeper.spec                |   16 +++++++++++--
 sources                       |    2 +-
 4 files changed, 60 insertions(+), 4 deletions(-)
---