[fedora-logos/f14/master: 3/3] Merge branch 'master' into f14

[Rex Dieter]

commit bfb9b4896b82d515931718c3f9d5f2d92e492dad
Merge: 9de3767 7077ee1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 28 12:11:34 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	fedora-logos.spec

 fedora-logos.spec |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)
---