Merging r49390 through r49399 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 30 Jul 2012 16:40:23 +0000 (16:40 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 30 Jul 2012 16:40:23 +0000 (16:40 +0000)

Trivial merge