Index: branches/eam_branches/doc/Branches.txt
===================================================================
--- branches/eam_branches/doc/Branches.txt	(revision 27815)
+++ branches/eam_branches/doc/Branches.txt	(revision 27831)
@@ -5,52 +5,65 @@
 DREV = revision just before branch was deleted
 
-NAME                     REV   DREV   NOTES
+NAME                     REV    DREV    NOTES
 -------------------------------------------------------------------------
-eam-psphot-branch	4039  22355
-eam_01_branch	       10388  22355
-eam_branch_00	       11209  22355
-eam_02_branch	       13033  22355
-eam_branch_20070817    14642  22355
-eam_branch_20070830    14951  22355
-eam_branch_20070921    14999  22355
-eam_branch_20071015    15441  22355
-eam_branch_20071023    15561  22355
-eam_branch_20071130    15742  22355
-eam_branch_20071212    15808  22355
-eam_branch_20071222    16009  22355
-eam_branch_20080124    16062  22355
-eam_branch_20080109    16171  22355
-eam_branch_20080121    16194  22355
-eam_branch_20080201    16273  22355
-eam_branch_20080229    16771  22355
-eam_branch_20080219    16777  22355
-eam_branch_20080225    16799  22355
-eam_branch_20080223    17030  22355
-eam_branch_20080324    17393  22355
-eam_branch_20080413    17464  22355
-eam_branch_20080408    17485  22355
-eam_branch_20080430    17509  22355
-eam_branch_20080511    17984  22355
-faketool               18059  
-eam_branch_20080613    18137  22355
-eam_branch_cleanup     18338  22355
-eam_branch_20080618    18341  22355
-eam_branch_20080620    18350  22355
-cleanup                18357  
-eam_branch_20080421    18424  22355
-eam_branch_20080706    18530  22355
-eam_branch_20080804    18880  22355
-eam_branch_20080806    19077  22355
-eam_branch_20080719    19079  22355
-eam_branch_20080918    19619  22355
-eam_branch_20080926    19862  22355
-eam_branch_20081024    20353  22355
-eam_branch_20081026    20406  22355
-eam_branch_20081124    20925  22355
-eam_branch_20081214    20992  22355
-eam_branch_20081230    21336  22355
-eam_branch_20090203    21344  23420
-eam_branch_20090206    21398  23420
-eam_branch_20090208    21501  23420
-eam_branch_20090303           23225 branch used to modify detrend normalization order, also moved version into to psbuild: reintegrated.
-eam_branch_20090312           23420 branch used to create ppImageCheckCTE and psastroExtract: reintegrated.
+Ohana.20100407           27772  27828   some cosmetic improvements to kapa, create setphot program [REINTEGRATED]
+stackphot.20100406       27656  27830   finish up the basic stack photometry program (psphotStack) [REINTEGRATED]
+relastro.20100326        27559  27827   update relastro to correctly handle proper motion [REINTEGRATED]
+20100225                 27528  27824   finish modifications to the CR masking started by CZW [REINTEGRATED]
+largefiles.20100314      27430  27829   update Ohana to handle large files (fseeko, etc) [REINTEGRATED]
+20091201                 26885  27823   dev work on ppSub kernel matching issues [REINTEGRATED]
+psphot.stack.20100120    26774  27826   used for side work on psphot API re-org for stacks [REINTEGRATED]
+psModules.stack.20100120 26775  27825   used for side work on psphot API re-org for stacks [REINTEGRATED]
+
+(all below reintegrated)
+
+eam_branch_20090303      2300?  23225   branch used to modify detrend normalization order, also moved version into to psbuild: reintegrated.
+eam_branch_20090312      2300?  23420   branch used to create ppImageCheckCTE and psastroExtract: reintegrated.
+
+eam_branch_20090208      21501  23420
+eam_branch_20090206      21398  23420
+eam_branch_20090203      21344  23420
+eam_branch_20081230      21336  22355
+eam_branch_20081214      20992  22355
+eam_branch_20081124      20925  22355
+eam_branch_20081026      20406  22355
+eam_branch_20081024      20353  22355
+eam_branch_20080926      19862  22355
+eam_branch_20080918      19619  22355
+eam_branch_20080719      19079  22355
+eam_branch_20080806      19077  22355
+eam_branch_20080804      18880  22355
+eam_branch_20080706      18530  22355
+eam_branch_20080421      18424  22355
+cleanup                  18357  
+eam_branch_20080620      18350  22355
+eam_branch_20080618      18341  22355
+eam_branch_cleanup       18338  22355
+eam_branch_20080613      18137  22355
+faketool                 18059  
+eam_branch_20080511      17984  22355
+eam_branch_20080430      17509  22355
+eam_branch_20080408      17485  22355
+eam_branch_20080413      17464  22355
+eam_branch_20080324      17393  22355
+eam_branch_20080223      17030  22355
+eam_branch_20080225      16799  22355
+eam_branch_20080219      16777  22355
+eam_branch_20080229      16771  22355
+eam_branch_20080201      16273  22355
+eam_branch_20080121      16194  22355
+eam_branch_20080109      16171  22355
+eam_branch_20080124      16062  22355
+eam_branch_20071222      16009  22355
+eam_branch_20071212      15808  22355
+eam_branch_20071130      15742  22355
+eam_branch_20071023      15561  22355
+eam_branch_20071015      15441  22355
+eam_branch_20070921      14999  22355
+eam_branch_20070830      14951  22355
+eam_branch_20070817      14642  22355
+eam_02_branch	         13033  22355
+eam_branch_00	         11209  22355
+eam_01_branch	         10388  22355
+eam-psphot-branch        	4039  22355
+