Merge pull request #2899 from ilya-lavrenov:tapi_ex
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 30 Jun 2014 10:05:24 +0000 (10:05 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 30 Jun 2014 10:05:24 +0000 (10:05 +0000)

Trivial merge