Sheng Yang f37b089fce Revert "Removing baremetal related references"
This reverts commit 99ea4011b18356d09686889205ef5df1b170b0dc.

Conflicts:
	server/src/com/cloud/network/NetworkServiceImpl.java
2013-06-21 09:46:56 -07:00
..