auto-latest update: 2008-07-06_12.20_Sun
Merge branch 'out-of-tree'