reintegrating 2.4


git-svn-id: http://sunny.svnrepository.com/svn/sunny-side-up-general/metatags/branches/3.0@5080 7b40dde9-fc51-43d4-b609-63a66f0a0cee