Bundling Public and Private Goods