[googlecl/f12/master: 6/6] Merge remote branch 'origin/master' into f12/master

[Adam Goode]

commit 93dba4bfb4a2a9e6f6553d744cf1f5a2c3f21ed0
Merge: 2221b2e 7c4d230
Author: Adam Goode <adam at spicenitz.org>
Date:   Fri Jul 30 10:37:30 2010 -0400

    Merge remote branch 'origin/master' into f12/master
    
    Conflicts:
    	.gitignore
    	googlecl.spec
    	sources

 .gitignore    |    2 +-
 googlecl.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 4fa4093,b5f9901..d283c6e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--googlecl-0.9.8.tar.gz
+ googlecl-0.9.9.tar.gz