Merging r49255 through r49256 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 26 Jul 2012 16:12:41 +0000 (16:12 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 26 Jul 2012 16:12:41 +0000 (16:12 +0000)

Trivial merge