Merged revisions 1439525 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1439525 | dkulp | 2013-01-28 12:48:40 -0500 (Mon, 28 Jan 2013) | 18 lines

  Merged revisions 1439487 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

  ........
    r1439487 | dkulp | 2013-01-28 11:44:37 -0500 (Mon, 28 Jan 2013) | 10 lines

    Merged revisions 1439484 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk

    ........
      r1439484 | dkulp | 2013-01-28 11:41:49 -0500 (Mon, 28 Jan 2013) | 2 lines

      [CXF-4750] If the "base" is an enum, but the actual type isn't, it shouldn't be mapped to an enum

    ........

  ........

........

git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes@1439546 13f79535-47bb-0310-9956-ffa450edef68
Recording revisions 1433309,1435037,1438435,1439525 via  git from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes



git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes@1439547 13f79535-47bb-0310-9956-ffa450edef68
Blocking revisions 1431988,1433067,1433140,1434362,1437066,1437152,1437367,1437572,1438090,1438091,1438092,1438095,1438418,1438434,1438445,1438475,1438493,1439524,1439526,1439527 via  git from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes



git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes@1439548 13f79535-47bb-0310-9956-ffa450edef68