whoops, didn't notice cvs found a version conflict...