Merging r38819 through r38831 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 29 Jul 2011 21:14:20 +0000 (21:14 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 29 Jul 2011 21:14:20 +0000 (21:14 +0000)

Trivial merge