Branches cleaning.
Slight changes in functional tests.
Slight changes to ease Rails 2.2 support.
Scramble PDF title (#1204).
Merged r2231 from 0.8-stable (#2402).