Merge remote branch 'dkg/master'
authormike castleman <m@mlcastle.net>
Sat, 9 Jan 2010 22:25:24 +0000 (17:25 -0500)
committermike castleman <m@mlcastle.net>
Sat, 9 Jan 2010 22:25:24 +0000 (17:25 -0500)

Trivial merge