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

[Adam Tkac]

commit 5bf7193f67f64cdec17dacc1eec71a274fa989e2
Merge: f6daef1 7175565
Author: Adam Tkac <atkac at redhat.com>
Date:   Wed Jan 19 11:22:41 2011 +0100

    Merge remote branch 'origin/master' into f14

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