Merging r47895 through r47948 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 15 Jun 2012 12:29:20 +0000 (12:29 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 15 Jun 2012 12:29:20 +0000 (12:29 +0000)

Trivial merge