Merge branch 'GCI2010'
authorSamuel J. Greear <sjg@thesjg.com>
Fri, 10 Dec 2010 06:16:48 +0000 (06:16 +0000)
committerSamuel J. Greear <sjg@thesjg.com>
Fri, 10 Dec 2010 06:16:48 +0000 (06:16 +0000)

Trivial merge