Merging r48110 through r48114 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 20 Jun 2012 12:06:48 +0000 (12:06 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 20 Jun 2012 12:06:48 +0000 (12:06 +0000)

Trivial merge