Merge remote-tracking branch 'private/master'
authorBrian Norris <banorris@uci.edu>
Tue, 23 Apr 2013 01:43:20 +0000 (18:43 -0700)
committerBrian Norris <banorris@uci.edu>
Tue, 23 Apr 2013 01:43:20 +0000 (18:43 -0700)

Trivial merge