Update magma (August 3 2013)

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

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

Conflicts:
	base/arch/x86/hal/hal_x86.c
	base/include/rtai_usi.h