Merge branch 'brian'
authorBrian Norris <banorris@uci.edu>
Tue, 3 Jul 2012 21:16:02 +0000 (14:16 -0700)
committerBrian Norris <banorris@uci.edu>
Tue, 3 Jul 2012 21:16:02 +0000 (14:16 -0700)

Trivial merge