Camlistore + Toshnix's Changes Not Yet Upstream