tree 21312c0f62c433aabf613b52f7fef3abd6574ff3
parent 1b3920702923fadd4990ddd63543a5391e0b5a0d
parent 8f662da298766ba663140514fcd177af1c2098a5
author Hristo Iliev <hsiliev@gmail.com> 1299911408 +0200
committer Hristo Iliev <hsiliev@gmail.com> 1299911408 +0200

Merge branch 'master' into bug324991-eclipse-structure

Conflicts:
	build-kernel/bin/dmk.bat
	build-kernel/build.xml
	build-kernel/lib/org.eclipse.virgo.kernel.launch.properties
	build.versions
	org.eclipse.virgo.kernel.osgi/src/main/java/org/eclipse/virgo/kernel/osgi/region/RegionManager.java