auto-latest update: 2008-06-25_12.40_Wed
Merge branch 'out-of-tree'