K 10 svn:author V 6 adrian K 8 svn:date V 27 2011-05-14T04:05:23.256421Z K 7 svn:log V 131 Fixes from the Atheros HAL - formatting; update Merlin checks to be consistent. Nothing functional should change with this commit. END