Merge remote branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Tue, 19 Jan 2010 02:09:55 +0000 (15:09 +1300)
committerKeith Packard <keithp@keithp.com>
Tue, 19 Jan 2010 02:09:55 +0000 (15:09 +1300)

Trivial merge