Merge commit 'origin/plcapi-nova' into plcapi-nova
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Fri, 28 Sep 2012 00:40:56 +0000 (20:40 -0400)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Fri, 28 Sep 2012 00:40:56 +0000 (20:40 -0400)

Trivial merge