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

[Matej Cepl]

commit fad0a97707f052353d4d1928a1f901093c20d062
Merge: f0b2641 77298df
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Wed Jun 1 21:02:53 2011 +0200

    Merge branch 'master' into el5

 .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(-)
---