Merge branch 'master' of git@gitorious.org:at-spi2-core/mainline