Merging r48407 through r48409 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 29 Jun 2012 14:34:29 +0000 (14:34 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 29 Jun 2012 14:34:29 +0000 (14:34 +0000)

Trivial merge