Merging r48241 through r48245 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 24 Jun 2012 18:01:46 +0000 (18:01 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 24 Jun 2012 18:01:46 +0000 (18:01 +0000)

Trivial merge