Merge branch 'brian'
authorBrian Norris <banorris@uci.edu>
Thu, 2 Aug 2012 23:55:58 +0000 (16:55 -0700)
committerBrian Norris <banorris@uci.edu>
Thu, 2 Aug 2012 23:55:58 +0000 (16:55 -0700)

Trivial merge