Started on getting --local to merge properly. Needs lots more testing!
Started on getting --local to merge properly. Needs lots more testing!


git-svn-id: 8d20f7f0fc00d4e859587c97dba74f42e277d745@2079 9f8c893c-44ee-0310-b757-c8ca8341c71e

timdiels/0publish