Merge pull request #88 from kberg/master
authorRobert Konigsberg <konigsberg@google.com>
Thu, 22 Sep 2011 14:40:11 +0000 (07:40 -0700)
committerRobert Konigsberg <konigsberg@google.com>
Thu, 22 Sep 2011 14:40:11 +0000 (07:40 -0700)
Fixing bug 87


Trivial merge