We are shaking up trunk tonight! allow data dir to be specified (issue #6967 reported...