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

[Adam Tkac]

commit 8be710daf93001661ba256c73b8ecdb8bf70af1c
Merge: 88e87fc ddcead8
Author: Adam Tkac <atkac at redhat.com>
Date:   Tue Nov 29 15:45:13 2011 +0100

    Merge remote-tracking branch 'origin/master' into f16

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