Merge "Adds Heat and external network support"
authorDan Radez <dradez@redhat.com>
Tue, 26 May 2015 17:18:29 +0000 (17:18 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 26 May 2015 17:18:29 +0000 (17:18 +0000)

Trivial merge