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

[Adam Tkac]

commit 88e87fc512c3d001af9a51a2b532d44a839beb76
Merge: 3e35c45 63f76de
Author: Adam Tkac <atkac at redhat.com>
Date:   Thu Nov 10 12:29:01 2011 +0100

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

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