From: Ying Liu Date: Fri, 19 Aug 2011 07:47:07 +0000 (-0700) Subject: merge with ying's branch X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=49d5a14c7f5d0e8fedbf73bf8be529c2edab7328;p=openstack-build%2Fneutron-build.git merge with ying's branch --- 49d5a14c7f5d0e8fedbf73bf8be529c2edab7328