Merge branch 'unstable'
authorForrest Voight <forrest@forre.st>
Tue, 16 Aug 2011 03:37:39 +0000 (23:37 -0400)
committerForrest Voight <forrest@forre.st>
Tue, 16 Aug 2011 03:37:39 +0000 (23:37 -0400)

Trivial merge