[Diswork-commits] r17 - trunk