[goddard-backgrounds/f14/master: 6/6] Merge branch 'f13/master' into f14/master

[Martin Sourada]

commit 09739a414509dc28ed35501a1351016c670379e9
Merge: 3cd2f2e d26f71c
Author: Martin Sourada <mso at fedoraproject.org>
Date:   Fri Jul 30 23:02:42 2010 +0200

    Merge branch 'f13/master' into f14/master
    
    Conflicts:
    	goddard-backgrounds.spec
    
    merge f13 branch

 goddard-backgrounds.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---