Merge branch 'master' into anon_class_tests anon_class_tests mirror/anon_class_tests
t0m [Fri, 17 Jul 2009 23:27:38 +0000 (00:27 +0100)]

Trivial merge