config update
experimental branch builds fine again
update from anoncvs
git experimental updates, checks out and merges
Merge branch 'master' into master-experimental