Merge https://github.com/Itseez/opencv
authorNghia Ho <nghiaho12@yahoo.com>
Wed, 31 Jul 2013 13:40:34 +0000 (23:40 +1000)
committerNghia Ho <nghiaho12@yahoo.com>
Wed, 31 Jul 2013 13:40:34 +0000 (23:40 +1000)
Keeping up to date


Trivial merge