[git/f15: 2/2] Merge branch 'master' into f15

[Adam Tkac]

commit c9e0aaf0441782822f125f294db79925f4b280ae
Merge: 761a711 f8faec0
Author: Adam Tkac <atkac at redhat.com>
Date:   Mon Sep 26 11:37:13 2011 +0200

    Merge branch 'master' into f15

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