[Billy-commits] r25 - trunk