merge: fix build & tests with older tooling
authorLubomir Rintel <lkundrak@v3.sk>
Tue, 2 Jun 2015 10:30:51 +0000 (12:30 +0200)
committerLubomir Rintel <lkundrak@v3.sk>
Tue, 2 Jun 2015 10:31:08 +0000 (12:31 +0200)

Trivial merge