[wordpress/f13: 16/16] Merge branch 'el6' into f13

[Matej Cepl]

commit a7b92a84141e2738ac8890c716ea8d79473c4e64
Merge: 622441d 6ba3b26
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Thu Jun 2 14:40:00 2011 +0200

    Merge branch 'el6' into f13

 .gitignore                      |    1 -
 wordpress-move-wp-content.patch |   22 ++++++++++++++++++++--
 wordpress.spec                  |   37 +++++++++++++++++++++----------------
 3 files changed, 41 insertions(+), 19 deletions(-)
---