#
#
# patch "Makefile.am"
#  from [946b1ee0318dde6676b4e619488fffe6caf01067]
#    to [8c9c0793bf51da75e5f7dfc8979bd8bda8458150]
# 
# patch "policy.cc"
#  from [89987029ecec54fb9f5fa4e30c6c44b249fe3e10]
#    to [e20582e31520a24bea1dc882511772489859f0c9]
#
============================================================
--- Makefile.am	946b1ee0318dde6676b4e619488fffe6caf01067
+++ Makefile.am	8c9c0793bf51da75e5f7dfc8979bd8bda8458150
@@ -340,7 +340,8 @@ UNIT_TEST_OBJ_SUPPORT =							\
 	mtn-schema_migration.$(OBJEXT)					\
 	mtn-specialized_lexical_cast.$(OBJEXT) mtn-ssh_agent.$(OBJEXT)	\
 	mtn-std_hooks.$(OBJEXT) mtn-ui.$(OBJEXT) mtn-work.$(OBJEXT)	\
-	mtn-work_migration.$(OBJEXT)
+	mtn-work_migration.$(OBJEXT) mtn-branch_name.$(OBJEXT)		\
+	mtn-editable_policy.$(OBJEXT)
 
 # primaries
 
============================================================
--- policy.cc	89987029ecec54fb9f5fa4e30c6c44b249fe3e10
+++ policy.cc	e20582e31520a24bea1dc882511772489859f0c9
@@ -39,7 +39,7 @@ policy_branch::empty_policy(database & d
 shared_ptr<policy_branch>
 policy_branch::empty_policy(database & db)
 {
-  return (new policy_branch(db))->shared_from_this();
+  return shared_ptr<policy_branch>(new policy_branch(db));
 }
 
 policy_branch::policy_branch(editable_policy::delegation const & del,
@@ -58,14 +58,14 @@ policy_branch::create(editable_policy::d
 policy_branch::create(editable_policy::delegation const & del,
                       database & db)
 {
-  return (new policy_branch(del, db))->shared_from_this();
+  return shared_ptr<policy_branch>(new policy_branch(del, db));
 }
 
 shared_ptr<policy_branch>
 policy_branch::create(shared_ptr<editable_policy const> pol,
                       database & db)
 {
-  return (new policy_branch(pol, db))->shared_from_this();
+  return shared_ptr<policy_branch>(new policy_branch(pol, db));
 }
 
 bool