Merging r38237 through r38264 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 9 Jul 2011 17:49:36 +0000 (17:49 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 9 Jul 2011 17:49:36 +0000 (17:49 +0000)

Trivial merge