Merge remote-tracking branch 'joyent/v0.12'
authorFedor Indutny <fedor@indutny.com>
Wed, 8 Oct 2014 11:31:45 +0000 (15:31 +0400)
committerFedor Indutny <fedor@indutny.com>
Wed, 8 Oct 2014 11:31:45 +0000 (15:31 +0400)

Trivial merge