Merging r38296 through r38315 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 11 Jul 2011 18:18:42 +0000 (18:18 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 11 Jul 2011 18:18:42 +0000 (18:18 +0000)

Trivial merge