Clean up some merge fail
Clean up some merge fail

Gitorious-backup/vsr-mainline,gitorious/mainline,water/mainline,ericbutters/eric-gitorious,Gitorious-backup/vsr-mainline,elcom/gitorious,balcom/gitorious,Gitorious-backup/yousource,deld/gitorious,spencerwp/mainline,altrair/gitorious-openstack,Gitorious-backup/yousource-features,balcom/gitorious,vymiheev/Gitorious-OpenStack,tigefa4u/gitorious-mainline,Gitorious-backup/base_uri-fixes,Gitorious-backup/base_uri-fixes,SamuelMoraesF/Gitorious,tigefa4u/gitorious-mainline,grjones/gitorious-submodule-dependencies,spencerwp/mainline,deld/gitorious,spencerwp/mainline,balcom/gitorious,Gitorious-backup/base_uri-fixes,ericbutters/eric-gitorious,gnufied/gitorious,Gitorious-backup/yousource,Gitorious-backup/yousource-features,njall/wel-gitorious,rae/gitorious-mainline,vymiheev/Gitorious-OpenStack,altrair/gitorious-openstack,Gitorious-backup/mainline,adg29/asi.gitorious,Gitorious-backup/mainline,Gitorious-backup/franklin-devs-phpbbhub,vymiheev/Gitorious-OpenStack,gitorious/mainline,ericbutters/eric-gitorious,gnufied/gitorious,crazycode/gitorious,SamuelMoraesF/Gitorious,Gitorious-backup/franklin-devs-phpbbhub,elcom/gitorious,Gitorious-backup/base_uri-fixes,Gitorious-backup/vsr-mainline,cynipe/gitorious,victori/gitorious-jruby,adg29/asi.gitorious,water/mainline,victori/gitorious-jruby,gnufied/gitorious,tigefa4u/gitorious-mainline,njall/wel-gitorious,Gitorious-backup/mainline,grjones/gitorious-submodule-dependencies,Gitorious-backup/vsr-mainline,adg29/asi.gitorious,Gitorious-backup/mainline,crazycode/gitorious,victori/gitorious-jruby,grjones/gitorious-submodule-dependencies,njall/wel-gitorious,feniix/gitorious,adg29/asi.gitorious,rae/gitorious-mainline,spencerwp/mainline,gitorious/mainline,SamuelMoraesF/Gitorious,cynipe/gitorious,Gitorious-backup/yousource-features,Gitorious-backup/yousource,elcom/gitorious,altrair/gitorious-openstack,elcom/gitorious,Gitorious-backup/franklin-devs-phpbbhub,Gitorious-backup/franklin-devs-phpbbhub,rae/gitorious-mainline,feniix/gitorious,deld/gitorious,SamuelMoraesF/Gitorious,gitorious/mainline,rae/gitorious-mainline,feniix/gitorious,crazycode/gitorious,cynipe/gitorious,Gitorious-backup/yousource-features,tigefa4u/gitorious-mainline,Gitorious-backup/yousource,water/mainline