Merge branch 'master' into engine_traits
Tomas Doran (t0m) [Mon, 13 Jul 2009 21:01:51 +0000 (22:01 +0100)]

Trivial merge