Merge remote branch 'jrollins/master'
authormike castleman <m@mlcastle.net>
Sat, 9 Jan 2010 20:03:50 +0000 (15:03 -0500)
committermike castleman <m@mlcastle.net>
Sat, 9 Jan 2010 20:03:50 +0000 (15:03 -0500)

Trivial merge