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

[Adam Tkac]

commit 699de217b36ac24bfb536709e033bdd71ce029b6
Merge: 1a64300 71a8c91
Author: Adam Tkac <atkac at redhat.com>
Date:   Fri Aug 20 10:59:59 2010 +0200

    Merge remote branch 'origin/master' into f14
    
    Conflicts:
    	git.spec
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

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