Merge branch 'norris'
authorBrian Norris <banorris@uci.edu>
Fri, 21 Sep 2012 17:27:27 +0000 (10:27 -0700)
committerBrian Norris <banorris@uci.edu>
Fri, 21 Sep 2012 17:27:27 +0000 (10:27 -0700)
1 bugfix


Trivial merge