Merge remote branches 'mjgoins/master' and 'jrollins/master'
authormike castleman <m@mlcastle.net>
Sat, 9 Jan 2010 22:46:09 +0000 (17:46 -0500)
committermike castleman <m@mlcastle.net>
Sat, 9 Jan 2010 22:46:09 +0000 (17:46 -0500)

Trivial merge