am b3ac5477: am 8df16d63: Merge change I7f047786 into eclair

Merge commit 'b3ac54771e6d5dd2a173797c9daf3efa317fa29d'

* commit 'b3ac54771e6d5dd2a173797c9daf3efa317fa29d':
  Update the SimpleMesh API to support new attribute types.  Also spilt add/set commands to avoid permutation explosion.