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

[Adam Tkac]

commit 5083be16822cd168ccac519e3d504dd173a5dce4
Merge: 3a27ad0 154dc10
Author: Adam Tkac <atkac at redhat.com>
Date:   Fri Oct 22 09:36:51 2010 +0200

    Merge remote branch 'origin/master' into f14

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