Merge branch 'master' of https://github.com/nghiaho12/opencv
authorNghia Ho <nghiaho12@yahoo.com>
Wed, 31 Jul 2013 14:03:39 +0000 (00:03 +1000)
committerNghia Ho <nghiaho12@yahoo.com>
Wed, 31 Jul 2013 14:03:39 +0000 (00:03 +1000)

Trivial merge