Thomas Heute
committed
on 04 Jul 07
Apply fixes from 2.6 Branch. Fixing: JBPORTAL-1531, JBPORTAL-1526