Merging r47886 through r47887 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 14 Jun 2012 11:27:37 +0000 (11:27 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 14 Jun 2012 11:27:37 +0000 (11:27 +0000)

Trivial merge