Merging r47382 through r47398 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 4 Jun 2012 10:55:05 +0000 (10:55 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 4 Jun 2012 10:55:05 +0000 (10:55 +0000)

Trivial merge