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

[Matej Cepl]

commit 2e078073cb11f53fb35662966c1a674850c8fa89
Merge: 1315178 0bdcec9
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Jul 5 03:20:24 2011 +0200

    Merge branch 'el6' into el5

 .gitignore     |    3 +++
 sources        |    2 +-
 wordpress.spec |    9 ++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)
---