Merge remote-tracking branch 'origin/master' into type-nats
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Sat, 24 Mar 2012 23:23:17 +0000 (16:23 -0700)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Sat, 24 Mar 2012 23:23:17 +0000 (16:23 -0700)

Trivial merge