[loggerhead/el6/master: 3/3] Merge branch 'master' into el6

[Toshio くらとみ]

commit 2407f7973f8cdbe16fce893614c95c641d331e43
Merge: 36613e3 7bc3448
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Mar 24 19:49:19 2011 -0700

    Merge branch 'master' into el6

 .gitignore      |    1 +
 loggerhead.spec |   10 ++++++++--
 sources         |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 15dea69,e7dc4a6..10719f9
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -loggerhead-1.17.tar.gz
  /loggerhead-1.18.tar.gz
+ /loggerhead-1.18.1.tar.gz