[Diswork-commits] r18 - trunk