Merge remote-tracking branch 'origin/master' into pldi13
authorBrian Norris <banorris@uci.edu>
Sat, 3 Nov 2012 03:20:49 +0000 (20:20 -0700)
committerBrian Norris <banorris@uci.edu>
Sat, 3 Nov 2012 03:20:49 +0000 (20:20 -0700)

Trivial merge