[MERGE] repository.reconcile_actions

[Robert Collins]

Adjusted as per our conversation.

-Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: reconcile-actions.patch
Type: text/x-patch
Size: 10009 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070808/a983b335/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070808/a983b335/attachment.pgp