Merging r47727 through r47739 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 11 Jun 2012 11:43:06 +0000 (11:43 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 11 Jun 2012 11:43:06 +0000 (11:43 +0000)

Trivial merge