K 10 svn:author V 6 adrian K 8 svn:date V 27 2011-09-15T17:11:03.478031Z K 7 svn:log V 62 Merge in beacon related fixes (mostly STA related) from HEAD. END