Merging r49149 through r49167 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 24 Jul 2012 09:03:40 +0000 (09:03 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 24 Jul 2012 09:03:40 +0000 (09:03 +0000)

Trivial merge