Todd Willey f58b4f74e3 Merge trunk + wsgirouter

2011-01-12 17:47:43 -05:00

..

nova-api.conf

Merge trunk + wsgirouter

2011-01-12 17:47:43 -05:00