[Bro-Dev] Masters updated

[Robin Sommer]

I've updated all the masters and devels to

    - integrate a round of cleanup removing files no longer necessary.

    - the latest changes from SVN.

I've also adapted the test-suite (in bro-private) to work with the
new setup, and it passes fine with all the changes (well, to be
precise, it reports the same differences as svn trunk; seems it's
not completely up to date).

We should now see if master is working for everybody. If so, we'll
have a stable base to work from. 

Robin

-- 
Robin Sommer * Phone +1 (510) 722-6541 * robin at icir.org
ICSI/LBNL    * Fax   +1 (510) 666-2956 *   www.icir.org