not much point in pushing it upstream since the new facter will be c++11 based and needs newer boost..