[bknr-cvs] r2544 - branches/hoan