Merging r48303 through r48305 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 26 Jun 2012 09:48:24 +0000 (09:48 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 26 Jun 2012 09:48:24 +0000 (09:48 +0000)

Trivial merge