Merging r48284 through r48288 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 25 Jun 2012 19:52:07 +0000 (19:52 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 25 Jun 2012 19:52:07 +0000 (19:52 +0000)

Trivial merge