Squashed commit of the following: Author: Brian Paul <brianp@vmware.com> Signed-off-by: Brian Paul <brianp@vmware.com> Signed-off-by: Brian Paul <brianp@vmware.com> Signed-off-by: Brian Paul <brianp@vmware.com> Signed-off-by: Brian Paul <brianp@vmware.com> Signed-off-by: Brian Paul <brianp@vmware.com> Signed-off-by: Brian Paul <brianp@vmware.com> Signed-off-by: Brian Paul <brianp@vmware.com> Signed-off-by: Brian Paul <brianp@vmware.com> Signed-off-by: Brian Paul <brianp@vmware.com> Signed-off-by: Brian Paul <brianp@vmware.com>