Code review comment for lp:~yamahata/nova/boot-from-volume-1

I resolved the conflict merging nova trunk.

On Fri, Jul 01, 2011 at 04:01:26PM -0000, Mark Washenberger wrote:
> Setting to WIP until the versions are updated. Sorry for the difficulties here. I'll check back in this weekend to see if we can move this merge along while things are a bit more quiet.
> --
> https://code.launchpad.net/~yamahata/nova/boot-from-volume-1/+merge/65850
> You are the owner of lp:~yamahata/nova/boot-from-volume-1.
>

--
yamahata