Merge pull request #2944 from bkueng:fix_compiler_error
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 7 Jul 2014 11:18:31 +0000 (11:18 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 7 Jul 2014 11:18:31 +0000 (11:18 +0000)

Trivial merge