svn path=/trunk/; revision=31932
Same fixes as for trunk done here too. svn path=/trunk/; revision=31923