Merging r47662 through r47666 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 10 Jun 2012 12:15:39 +0000 (12:15 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 10 Jun 2012 12:15:39 +0000 (12:15 +0000)

Trivial merge