Merging r49146 through r49148 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 23 Jul 2012 18:28:00 +0000 (18:28 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 23 Jul 2012 18:28:00 +0000 (18:28 +0000)

Trivial merge