public marks

PUBLIC MARKS from mfaure with tags apache & svn