Merging r45718 through r45737 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 18 Apr 2012 07:57:20 +0000 (07:57 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 18 Apr 2012 07:57:20 +0000 (07:57 +0000)

Trivial merge