Merging r45738 through r45743 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 18 Apr 2012 12:54:12 +0000 (12:54 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 18 Apr 2012 12:54:12 +0000 (12:54 +0000)

Trivial merge