[Cantharella-commits] r154 - trunk