Merging r47793 through r47805 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 12 Jun 2012 21:30:49 +0000 (21:30 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 12 Jun 2012 21:30:49 +0000 (21:30 +0000)

Trivial merge