Merge pull request #3205 from parafin:ximea_unix-3.0
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sun, 14 Sep 2014 18:44:41 +0000 (18:44 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sun, 14 Sep 2014 18:44:41 +0000 (18:44 +0000)

Trivial merge