Support for merging.
Fixed a small bug inside the ContextParameterHandler
Authored by: calmera 2008-10-16
Parent: [r128]