Merge https://github.com/Itseez/opencv
authorNghia Ho <nghiaho12@yahoo.com>
Thu, 15 Aug 2013 11:51:36 +0000 (21:51 +1000)
committerNghia Ho <nghiaho12@yahoo.com>
Thu, 15 Aug 2013 11:51:36 +0000 (21:51 +1000)

Trivial merge