[googlecl/f12/master: 3/3] Merge branch 'f12' into el6

[Adam Goode]

commit 31708d787525c69fabbe63b7860e15b3b39fbdb6
Merge: df67082 465f17f
Author: Adam Goode <adam at spicenitz.org>
Date:   Sat Jul 31 22:33:05 2010 -0400

    Merge branch 'f12' into el6
    
    Conflicts:
    	.gitignore

 .gitignore    |    1 +
 googlecl.spec |   76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sources       |    1 +
 3 files changed, 78 insertions(+), 0 deletions(-)
---