Andrew Hind 9116330a10 Build fix
- remove merge issues that causes a double bootstrap
- move bootstrap bean into the correct context

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-27 13:42:17 +00:00
..
2008-05-27 13:42:17 +00:00