auto-latest update: 2008-06-24_07.28_Tue
Merge branch 'out-of-tree'