[Cantharella-commits] r40 - trunk