Commits in diary2008/mainline:master