* commit 'c708b540':
  timer: use mach_absolute_time as high resolution clock on darwin

Conflicts:
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>