OSX compatibility improvements.
Authored by: bruno.herbelin@gmail.com 2010-09-14
Parent: [r240]
Child: [r242]