Nat's patch applied (Mac OS X related stuff)
docu