Merging r40598 through r40600 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 27 Sep 2011 10:03:26 +0000 (10:03 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 27 Sep 2011 10:03:26 +0000 (10:03 +0000)

Trivial merge