Merge branch 'unstable'
authorForrest Voight <forrest@forre.st>
Sat, 27 Aug 2011 03:32:19 +0000 (23:32 -0400)
committerForrest Voight <forrest@forre.st>
Sat, 27 Aug 2011 03:32:19 +0000 (23:32 -0400)

Trivial merge