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

[Adam Tkac]

commit d9fd58e07799226d96ec27b3389b995f91e857b1
Merge: 5bf7193 c658997
Author: Adam Tkac <atkac at redhat.com>
Date:   Mon Jan 31 11:50:24 2011 +0100

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

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