Merging r47669 through r47673 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 10 Jun 2012 12:33:30 +0000 (12:33 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 10 Jun 2012 12:33:30 +0000 (12:33 +0000)

Trivial merge