Merging r49405 through r49410 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 31 Jul 2012 13:17:07 +0000 (13:17 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 31 Jul 2012 13:17:07 +0000 (13:17 +0000)

Trivial merge