Fix weaved to make it work with the new libweave
am: bae6c02cd9

* commit 'bae6c02cd98daa7b731c75d972a818b06997a9e4':
  Fix weaved to make it work with the new libweave