Merge pull request #4048 from vpisarev:hal_fixes
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 22 May 2015 21:19:03 +0000 (21:19 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 22 May 2015 21:19:03 +0000 (21:19 +0000)

Trivial merge