d6e13
author Olof Johansson <olof@lixom.net> 1330888598 -0800
committer Olof Johansson <olof@lixom.net> 1330888598 -0800

Merge branch 'depends/rmk/for-armsoc' into for-3.4/cleanup-and-fixes
"�e��,x