Merge branch 'master' into testsuite-work * master: docs, tests: synchronize examples from docs to tests
2011-07-03T15:46:55