[openarena/f14: 4/4] Merge remote-tracking branch 'origin/master' into f14

[Hans de Goede]

commit 59d001f0e185051fb35fd35cbc6cd8c059b4a832
Merge: 1ffcbae 1a0cd2c
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Thu Jul 28 16:15:55 2011 +0200

    Merge remote-tracking branch 'origin/master' into f14
    
    Conflicts:
    	openarena.sh
    	openarena.spec

 openarena.sh   |   10 ++++++----
 openarena.spec |   12 +++++++++---
 2 files changed, 15 insertions(+), 7 deletions(-)
---