Merge commit 'v0.90.6' into citrix
authorJustin Pettit <jpettit@nicira.com>
Tue, 6 Oct 2009 21:33:31 +0000 (14:33 -0700)
committerJustin Pettit <jpettit@nicira.com>
Tue, 6 Oct 2009 21:33:31 +0000 (14:33 -0700)

Trivial merge