[wordpress/f14: 5/6] Merge branch 'master' into f14

[Matej Cepl]

commit 05844514b7fb41747fb431de155e1155c39407b5
Merge: e153eb0 7689123
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Wed Jul 13 02:32:10 2011 +0200

    Merge branch 'master' into f14

 .gitignore     |    1 +
 sources        |    2 +-
 wordpress.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 5e26a59,f07bb74..cfbcde5
--- a/.gitignore
+++ b/.gitignore
@@@ -6,5 -6,7 +6,6 @@@ wordpress-3.0.1.tar.g
  /wordpress-3.1.1.tar.gz
  /wordpress-3.1.2.tar.gz
  /wordpress-3.1.3.tar.gz
 -/wordpress-3.2-RC1.zip
 -/wordpress-3.2-RC3.zip
 +/wordpress-3.1.4.tar.gz
  /wordpress-3.2.tar.gz
+ /wordpress-3.2.1.tar.gz