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

[Jon Ciesla]

commit e152f56c751dd844833670c9cc722c4cd675cfc5
Merge: ab441cd eb53a6a
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Mon Mar 21 10:02:38 2011 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	wordpress.spec

 .gitignore                           |    2 ++
 README.fedora.wordpress-mu           |    5 +++++
 sources                              |    2 +-
 wordpress-debian_patches_hello.patch |   11 +++++------
 wordpress.spec                       |   21 +++++++++++++++++----
 5 files changed, 30 insertions(+), 11 deletions(-)
---