Merge remote-tracking branch 'origin/master' into type-nats
authorIavor S. Diatchki <diatchki@galois.com>
Wed, 21 Mar 2012 00:22:42 +0000 (17:22 -0700)
committerIavor S. Diatchki <diatchki@galois.com>
Wed, 21 Mar 2012 00:22:42 +0000 (17:22 -0700)

Trivial merge