[wordpress/f18: 2/3] Merge branch 'master' into f18

[Remi Collet]

commit 8d804758fbbfdcafc68aaf86b2fab1d52b598fbd
Merge: d3c4c42 240dbed
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Jan 30 14:20:25 2013 +0100

    Merge branch 'master' into f18

 .gitignore           |    1 +
 sources              |    2 +-
 wordpress-httpd-conf |    7 +++++++
 wordpress.spec       |   21 ++++++++++++++++-----
 4 files changed, 25 insertions(+), 6 deletions(-)
---