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

[Toshio くらとみ]

commit 22616fbd23aa081abfdd8a89bc117735cfc497ce
Merge: d6b2ed2 7bc3448
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Mar 24 19:52:30 2011 -0700

    Merge branch 'master' into f13
    
    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..ee1a93e
--- 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
++loggerhead-1.18.1.tar.gz