[Cantharella-commits] r3 - trunk