Merge remote-tracking branch 'origin/type-nats' into type-nats-merge
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Mon, 19 Dec 2011 01:25:27 +0000 (17:25 -0800)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Mon, 19 Dec 2011 01:25:27 +0000 (17:25 -0800)

Trivial merge