auto-latest update: 2008-10-08_08.31_Wed
Merge branch 'out-of-tree'