Merge branch 'bgfg-gmg-gpu' into bgfg-gmg-merged
authorVladislav Vinogradov <vlad.vinogradov@itseez.com>
Thu, 9 Aug 2012 10:48:26 +0000 (14:48 +0400)
committerVladislav Vinogradov <vlad.vinogradov@itseez.com>
Thu, 9 Aug 2012 10:48:26 +0000 (14:48 +0400)

Trivial merge