[osiris-devel] merge madness

[Brian Wotring]

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

The current branch has been merged into mainline; expect some
warnings for the short term.  The branch, "rel_3_dev" is now dead.

Prior to the merge, a branch was created off of the 2.4.5 release to
deal with critical bug fixes.  The name of this branch is,
"rel_2_stable".

- --
     Brian Wotring ( brian at shmoo.com )
     PGP KeyID: 0x9674763D

-----BEGIN PGP SIGNATURE-----
Version: PGP 8.0.3 - not licensed for commercial use: www.pgp.com

iQA/AwUBQEX2PQ3seZ6WdHY9EQLp2gCg0DqMj/hZ2+ddHJsLesEh/MjEgUcAniVa
XrMHddDdNyI9DiZkiw45YVC9
=GXFo
-----END PGP SIGNATURE-----