Please take a look.
Oops.. LGTM
*** Submitted: openstack: fix build R=niemeyer CC= https://codereview.appspot.com/6907051