[MERGE] Restore default stacking policy support

[John Arbash Meinel]

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

Aaron Bentley wrote:
> Hi all,
> 
> This patch restores support for stacking policies to the branch command.
>  I've reorganized the code a bit so that:

One small thing, I think mwhudson has an open bug on this, which should
probably at least be mentioned in NEWS. It may be considered "fix released"
right now because we worked around it in 1.6, but this is fixing it in a
different way, and thus seems relevant to reference it. (Espec. since bzr.dev
still has the bug.)

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

iD8DBQFItw5jJdeBCYSNAAMRAtQmAKCIdgzlXTRU2uw1Si3AkTZRAxxpsQCaA/XX
Yd3BaGTQxSb3Ut7xZ94Y9Kc=
=RRVf
-----END PGP SIGNATURE-----