Merge branch 'depends/rmk/for-armsoc' into for-3.4/cleanup-and-fixes
authorOlof Johansson <olof@lixom.net>
Sun, 4 Mar 2012 19:16:38 +0000 (11:16 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 4 Mar 2012 19:16:38 +0000 (11:16 -0800)

Trivial merge