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

[Adam Tkac]

commit f305186449d6488825f8dee73b62a5122057c57b
Merge: 087d362 d5dd393
Author: Adam Tkac <atkac at redhat.com>
Date:   Tue Sep 7 11:20:07 2010 +0200

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

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