Merging r48308 through r48313 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 26 Jun 2012 15:29:22 +0000 (15:29 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 26 Jun 2012 15:29:22 +0000 (15:29 +0000)

Trivial merge