Merging r48575 through r48576 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 4 Jul 2012 07:37:21 +0000 (07:37 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 4 Jul 2012 07:37:21 +0000 (07:37 +0000)

Trivial merge