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

Trivial merge