Update magma (August 1 2013)

Signed-off-by: Alec Ari <neotheuser@ymail.com>
Merge branch 'magma'

Signed-off-by: Alec Ari <neotheuser@ymail.com>

Conflicts:
	base/arch/x86/Kconfig
	base/include/asm-x86/rtai_lxrt.h
	base/include/asm-x86/rtai_oldnames.h