Merging r50022 through r50023 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 19 Aug 2012 16:18:33 +0000 (16:18 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 19 Aug 2012 16:18:33 +0000 (16:18 +0000)

Trivial merge