Merge "Merge in pykickstart code"
authorJF Ding <jian-feng.ding@intel.com>
Thu, 18 Aug 2011 11:11:28 +0000 (19:11 +0800)
committerGerrit Code Review <gerrit2@gerrit.bj.intel.com>
Thu, 18 Aug 2011 11:11:28 +0000 (19:11 +0800)

Trivial merge