Merging r45792 through r45800 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 20 Apr 2012 09:57:03 +0000 (09:57 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 20 Apr 2012 09:57:03 +0000 (09:57 +0000)

Trivial merge