bundle. There are still a few rough edges but it's an improvement over
what we currently have. Fixes bug 5756.

svn path=/trunk/; revision=37093