ddd
fuck namespaces
metadata
added ceilometer
Merge branch 'linuxbridge' into linuxbridge_vlan

Conflicts:
	neutron/plugins/linuxbridge/linuxbridge_conf.ini
add ceilometer