r1639: Initial revision