Merging r38197 through r38219 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 8 Jul 2011 08:36:51 +0000 (08:36 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 8 Jul 2011 08:36:51 +0000 (08:36 +0000)

Trivial merge