[loggerhead/el5/master: 11/11] Merge branch 'master' into el5

[Toshio くらとみ]

commit 1f04d737553bc1f8e11860769296a87f89e04af4
Merge: 230d56b 7bc3448
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Mar 24 19:54:26 2011 -0700

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	loggerhead.spec
    	sources

 .gitignore      |    2 +-
 loggerhead.spec |   36 +++++++++++++++++++-----------------
 sources         |    2 +-
 3 files changed, 21 insertions(+), 19 deletions(-)
---
diff --cc .gitignore
index 1b6d823,e7dc4a6..a2f5692
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,1 @@@
--loggerhead-1.17.tar.gz
 -/loggerhead-1.18.tar.gz
+ /loggerhead-1.18.1.tar.gz