import of 2008-01-26 release