tree 7344eb7eef7531b9bc9bdd6f7b89e0a809d18bca
parent 6ac05c2a1e7699966bd8f9bfa6b811c5bb3ace1d
author Gert Vanthienen <gertv@apache.org> 1288729677 +0000
committer Gert Vanthienen <gertv@apache.org> 1288729677 +0000

Merge design updates - thanks to emjohson for providing these patches

Conflicts:
	pom.xml
	src/main/webapp/jbi/components/servicemix-exec.conf
	src/main/webapp/users-guide/manual.conf
	src/main/webapp/users-guide/toc.ssp

git-svn-id: https://svn.apache.org/repos/asf/servicemix/documentation/trunk@1030206 13f79535-47bb-0310-9956-ffa450edef68