Merging r39179 through r39190 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 8 Aug 2011 17:35:22 +0000 (17:35 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 8 Aug 2011 17:35:22 +0000 (17:35 +0000)

Trivial merge