Merging r45928 through r45935 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 24 Apr 2012 16:36:34 +0000 (16:36 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 24 Apr 2012 16:36:34 +0000 (16:36 +0000)

Trivial merge