auto-latest update: 2008-09-09_09.14_Tue
Merge branch 'out-of-tree'