Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit 67aeab0b77fb6be864088e69ea74a010b6543fa1)