The metadata and addresses collections in xml responses are malformed

The current openstack api v1.0 returns the following xml response:

<server flavorId="1" hostId="" id="1" imageId="10" name="server1" status="BUILD">
    <addresses>
        <public>
            <item>1.2.3.4</item>
        </public>
        <private>
            <item>192.168.0.3</item>
        </private>
    </addresses>
    <metadata>
        <foo>bar</foo>
    </metadata>
</server>

Notice that the addresses and metadata collections are not structured correctly. The correct response should look like this:

<server flavorId="1" hostId="" id="1" imageId="10" name="server1" status="BUILD">
    <addresses>
        <public>
            <ip addr="1.2.3.4"/>
        </public>
        <private>
            <ip addr="192.168.0.3"/>
        </private>
    </addresses>
    <metadata>
        <meta key="foo">bar</meta>
    </metadata>
</server>