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

[Matej Cepl]

commit 76e9e267b92ea692b3695ae30d7c2dd6c75a0fcf
Merge: 0584451 38915ae
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Wed Jul 13 02:35:42 2011 +0200

    Merge branch 'el6' into f14
    
    Conflicts:
    	.gitignore

 wordpress-2.8.6-r16625.patch |   11 -----
 wordpress-2.8.6-r17172.patch |   92 ------------------------------------------
 wordpress-FSF-address.patch  |   12 -----
 3 files changed, 0 insertions(+), 115 deletions(-)
---