Merge remote-tracking branch 'origin/master' into type-nats
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Wed, 25 Jan 2012 03:27:15 +0000 (19:27 -0800)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Wed, 25 Jan 2012 03:27:15 +0000 (19:27 -0800)

Trivial merge