Merge commit '68aa7c3'

Conflicts:
	hake/RuleDefs.hs

diff --cc hake/ArchDefaults.hs
Simple merge

diff --cc hake/RuleDefs.hs
index 52dfb9f,817765b..6c48993
--- 1/hake/RuleDefs.hs
--- 2/hake/RuleDefs.hs
+++ b/hake/RuleDefs.hs
@@@ -932,7 -950,6 +950,8 @@@ appBuildArch af tf args arch 
          cxxsrcs = Args.cxxFiles args
          gencsrc = Args.generatedCFiles args
          gencxxsrc = Args.generatedCxxFiles args
 +        
++
          appname = Args.target args
          -- XXX: Not sure if this is correct. Currently assuming that if the app
          -- contains C++ files, we have to use the C++ linker.

diff --cc kernel/arch/x86_64/syscall.c
Simple merge