Merge changes I02c2af4b,If6adaabc,I559b92ff
authorGiovanni Meo <gmeo@cisco.com>
Mon, 20 May 2013 10:28:05 +0000 (10:28 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 20 May 2013 10:28:05 +0000 (10:28 +0000)
commitaab7c08016dab70136793a108f7d7b8be3edc3c1
treed347df6255770016f84dc1d7c9fee0613fc936fd
parent0d05f8c08befb645e8159073b248f794f52822ea
parent4d8ea2149206e12d7601b34667a85f48ca82af6c
Merge changes I02c2af4b,If6adaabc,I559b92ff

* changes:
  Change generated MANIFEST.MF location
  Remove superfluous groupId.
  Add PDE OSGi launcher for the controller project