Rebase and merge pull request #342 from ilysenkov/bugfix_2470
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 29 Jan 2013 11:53:42 +0000 (15:53 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 29 Jan 2013 11:53:42 +0000 (15:53 +0400)

Trivial merge