[bangarang/f14: 5/5] Merge branch 'master' into f14

[Jaroslav Reznik]

commit 3c681f2e9cca3fb43ed12aa0cf062e3696d41ff1
Merge: bf43d2a 5423425
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Fri Jul 15 16:33:02 2011 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	bangarang.spec
    	sources

 .gitignore     |    3 +--
 bangarang.spec |   10 ++++++++--
 sources        |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
---