Merge branch 'tempwork-20080129' into temp-merge