Merge commit 'origin/ctrix' into k
authorJustin Pettit <jpettit@nicira.com>
Sat, 12 Sep 2009 01:40:38 +0000 (18:40 -0700)
committerJustin Pettit <jpettit@nicira.com>
Sat, 12 Sep 2009 01:40:38 +0000 (18:40 -0700)

Trivial merge