…under Jaunty by including the required headers" and "Fix const correctness on C strings.

(Gets rid of "deprecated conversion from string constant to ‘char*’" warnings
when compiling under gcc 4.3)"

Commit IDs 9c981f6 and a0e4aff.