Update magma (August 2 2013)

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

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