Merge remote-tracking branch 'origin/master'
authorBrian Norris <banorris@uci.edu>
Wed, 10 Oct 2012 22:21:32 +0000 (15:21 -0700)
committerBrian Norris <banorris@uci.edu>
Wed, 10 Oct 2012 22:21:32 +0000 (15:21 -0700)

Trivial merge