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

[Adam Tkac]

commit a4532d8d54ee238e143080c99ccbea8d211df697
Merge: 699de21 d5dd393
Author: Adam Tkac <atkac at redhat.com>
Date:   Tue Sep 7 10:15:21 2010 +0200

    Merge remote branch 'origin/master' into f14

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