Merging r39121 through r39134 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 7 Aug 2011 12:08:58 +0000 (12:08 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 7 Aug 2011 12:08:58 +0000 (12:08 +0000)

Trivial merge