[git/f16: 3/3] Merge remote-tracking branch 'origin/master' into f16

[Adam Tkac]

commit 3fff8e4bebe71f254a48cfa7f6d92b2a9471e2cb
Merge: 6d1b55b 77a1f9c
Author: Adam Tkac <atkac at redhat.com>
Date:   Tue Nov 1 13:45:04 2011 +0100

    Merge remote-tracking branch 'origin/master' into f16
    
    Conflicts:
    	git.spec

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