auto-latest update: 2008-05-31_10.33_Sat
Merge branch 'out-of-tree'