Upstream version 20070208p1