Merge "Updated Makefile to support different build targets. Removed delegating ctors...
authorErich Keane <erich.keane@intel.com>
Fri, 29 Aug 2014 16:27:09 +0000 (09:27 -0700)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Fri, 29 Aug 2014 16:27:17 +0000 (09:27 -0700)

Trivial merge