Merging r50224 through r50225 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 26 Aug 2012 16:43:24 +0000 (16:43 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 26 Aug 2012 16:43:24 +0000 (16:43 +0000)

Trivial merge