Datasource parameters added
Merge branch 'branch_20130208' of https://github.com/open-infinity/cmt into branch_20130208