Latest patch for r2 to r4, including a test case.

Ciao

Dominik ^_^  ^_^

-- 

Dominik Vogt
IBM Germany