odroid-x changes (probably minor)
Merge branch 'master' of git://github.com/MichaelMathieu/depth-estimation2