resync

git-svn-id: svn://softwarelivre.sapo.pt/broker/trunk@1643 b5e76149-5b1e-0410-8289-f826a2598d57