Merging r45693 through r45707 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 17 Apr 2012 10:09:47 +0000 (10:09 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 17 Apr 2012 10:09:47 +0000 (10:09 +0000)

Trivial merge