Merging r45801 through r45809 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 20 Apr 2012 13:15:57 +0000 (13:15 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 20 Apr 2012 13:15:57 +0000 (13:15 +0000)

Trivial merge