Merge commit 'local_master/myplc-0_4-branch' into myplc-0_4-branch
authorroot <root@cassidy.cs.princeton.edu>
Sun, 24 Oct 2010 20:12:42 +0000 (16:12 -0400)
committerroot <root@cassidy.cs.princeton.edu>
Sun, 24 Oct 2010 20:12:42 +0000 (16:12 -0400)

Trivial merge