Merge "fix convert failed caused by NoneType 'createopts'"
authorJian-feng ding <jian-feng.ding@intel.com>
Thu, 29 Dec 2011 08:11:17 +0000 (16:11 +0800)
committerGerrit Code Review <gerrit2@gerrit.bj.intel.com>
Thu, 29 Dec 2011 08:11:17 +0000 (16:11 +0800)

Trivial merge