Merge branch 'mingw-libdc1394-2-windows' of https://github.com/dominikrose/opencv...
authorDominik Rose <mya@server.fake>
Tue, 14 May 2013 14:49:08 +0000 (16:49 +0200)
committerDominik Rose <mya@server.fake>
Tue, 14 May 2013 14:49:08 +0000 (16:49 +0200)

Trivial merge