Merge remote-tracking branch 'tychoish/master'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 4 Dec 2011 19:59:13 +0000 (13:59 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 4 Dec 2011 19:59:13 +0000 (13:59 -0600)

Trivial merge