[389-ds-base/f13/master] (11 commits) ...fix git merge problems

Wed Oct 27 23:39:05 UTC 2010

Summary of changes:

  cde55f4... Merge branch 'f14' into f12 (*)
  0e1393e... Merge branch 'master' into f12 (*)
  054a732... Merge branch 'master' into f12 (*)
  5405674... Merge branch 'master' into f12 (*)
  2e9485b... updated files for 1.2.6.1 (*)
  b8d51ef... bump rev to rebuild (*)
  455fc89... Merge branch 'f13' into f12 (*)
  7bfb831... Merge branch 'f13' into f12 (*)
  088ea92... Merge branch 'f13' into f12 (*)
  92e640a... Merge branch 'f13' into f12 (*)
  2ed38ca... fix git merge problems

(*) This commit already existed in another branch; no separate mail sent