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

[Matej Cepl]

commit fb63954c3311911a24759f21714fc57275e7f958
Merge: 6690d55 77298df
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Wed Jun 1 21:01:35 2011 +0200

    Merge branch 'master' into f14

 .gitignore                      |    1 +
 sources                         |    2 +-
 wordpress-FSF-address.patch     |   12 ++++++
 wordpress-move-wp-content.patch |   12 ++++++
 wordpress.spec                  |   79 ++++++++++++++++++++++++---------------
 5 files changed, 75 insertions(+), 31 deletions(-)
---