Merge remote branch 'origin/master' into HEAD
authorBen Pfaff <blp@nicira.com>
Wed, 6 Oct 2010 19:24:16 +0000 (12:24 -0700)
committerBen Pfaff <blp@nicira.com>
Wed, 6 Oct 2010 19:24:16 +0000 (12:24 -0700)

Trivial merge