Ingo Weinhold c663ca2171 Merge branch 'master' into package-management
Conflicts:
	build/jam/HaikuImage
	src/system/kernel/arch/x86/64/arch.S
2013-05-12 00:18:19 +02:00
..
2013-04-12 23:28:46 -04:00
2012-10-07 10:48:17 +13:00
2012-06-25 13:43:53 -04:00