Merge remote-tracking branch 'origin/master' into type-nats
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Sun, 18 Mar 2012 22:26:41 +0000 (15:26 -0700)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Sun, 18 Mar 2012 22:26:41 +0000 (15:26 -0700)

Trivial merge