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

[Matej Cepl]

commit e8bc259282b5b6b322b30d854ffdc5915aee8a07
Merge: fb63954 6ba3b26
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Thu Jun 2 14:40:05 2011 +0200

    Merge branch 'el6' into f14

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