[MERGE] StackableBranch

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ian Clatworthy wrote:
> # Bazaar merge directive format 2 (Bazaar 0.90)
> # revision_id: ian.clatworthy at canonical.com-20080610045325-\
> #   hi3yug3nasoe6e1h
> # target_branch: ../Development1/
> # testament_sha1: faebafc1e65c0665e9bf55332d74bbfdf373afa0
> # timestamp: 2008-06-10 15:17:34 +1000
> # base_revision_id: ian.clatworthy at canonical.com-20080610013832-\
> #   9dt6c5h67eckiezo

Please don't submit unmergeable merge directives.

Bundle Buggy is freaking out because it doesn't have a copy of
ian.clatworthy at canonical.com-20080610013832-9dt6c5h67eckiezo and it
can't get one from ../Development1

Please either use bzr.dev as the submit branch, or supply some other
valid external URL for the submit branch.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD4DBQFITha80F+nu1YWqI0RAgKQAJ0XqnH0OL8BZ53zxIohV5xkTfpwFwCXc9tc
MVSFpZ9eSQ0tKFGdSscaEg==
=fUgL
-----END PGP SIGNATURE-----