osgi, merged from topping and mpilquist