auto-latest update: 2008-08-14_09.59_Thu
Merge branch 'out-of-tree'