Merge remote-tracking branch 'origin/type-nats'
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Sun, 25 Mar 2012 00:27:27 +0000 (17:27 -0700)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Sun, 25 Mar 2012 00:27:27 +0000 (17:27 -0700)

Trivial merge