merge conflicts

diff --cc Open-ILS/examples/fm_IDL.xml
Simple merge

diff --cc Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI/asset.pm
Simple merge

diff --cc Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/dbi.pm
Simple merge

diff --cc Open-ILS/src/perlmods/lib/OpenILS/Application/SuperCat.pm
index fcc8a5b,45d3a07..4e1218a
--- 1/Open-ILS/src/perlmods/lib/OpenILS/Application/SuperCat.pm
--- 2/Open-ILS/src/perlmods/lib/OpenILS/Application/SuperCat.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/SuperCat.pm
@@@ -1704,8 -1704,8 +1704,8 @@@ sub retrieve_copy 
                    $cpid,
                    { flesh             => 2,
                          flesh_fields  => {
 -                                              acn     => [qw/owning_lib record/],
 +                                              acn     => [qw/owning_lib record prefix suffix/],
-                                               acp     => [qw/call_number location status circ_lib stat_cat_entries notes/],
+                                               acp     => [qw/call_number location status circ_lib stat_cat_entries notes parts/],
                                }
                    })
              ->gather(1))
@@@ -1747,9 -1747,9 +1747,9 @@@ sub retrieve_callnumber 
                    $cnid,
                    { flesh             => 5,
                          flesh_fields  => {
 -                                              acn     => [qw/owning_lib record copies uri_maps/],
 +                                              acn     => [qw/owning_lib record copies uri_maps prefix suffix/],
                                                auricnm => [qw/uri/],
-                                               acp     => [qw/location status circ_lib stat_cat_entries notes/],
+                                               acp     => [qw/location status circ_lib stat_cat_entries notes parts/],
                                }
                    })
              ->gather(1))
@@@ -1796,8 -1796,8 +1796,8 @@@ sub basic_record_holdings 
                { flesh         => 5,
                  flesh_fields  => {
                                        bre     => [qw/call_numbers/],
 -                                      acn     => [qw/copies owning_lib/],
 +                                      acn     => [qw/copies owning_lib prefix suffix/],
-                                       acp     => [qw/location status circ_lib/],
+                                       acp     => [qw/location status circ_lib parts/],
                                }
                }
        )->gather(1);
@@@ -1948,9 -1948,9 +1948,9 @@@ sub new_record_holdings 
          },
                { flesh         => 5,
                  flesh_fields  => {
 -                                      acn     => [qw/copies owning_lib uri_maps/],
 +                                      acn     => [qw/copies owning_lib uri_maps prefix suffix/],
                                        auricnm => [qw/uri/],
-                                       acp     => [qw/circ_lib location status stat_cat_entries notes/],
+                                       acp     => [qw/circ_lib location status stat_cat_entries notes parts/],
                                        asce    => [qw/stat_cat/],
                                },
            ( $limit > -1 ? ( limit  => $limit  ) : () ),

diff --cc Open-ILS/src/sql/Pg/040.schema.asset.sql
Simple merge