Merging r48255 through r48256 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 25 Jun 2012 08:24:12 +0000 (08:24 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 25 Jun 2012 08:24:12 +0000 (08:24 +0000)

Trivial merge