Merge branch 'master' into mutex
authorBrian Demsky <bdemsky@uci.edu>
Tue, 18 Sep 2012 05:18:56 +0000 (22:18 -0700)
committerBrian Demsky <bdemsky@uci.edu>
Tue, 18 Sep 2012 05:18:56 +0000 (22:18 -0700)

Trivial merge