Martin Fowler has spoken against feature branching as well: http://martinfowler.com/bliki/FeatureBranch.html