Merge commit 'origin/postfixwhen' into blead
Rafael Garcia-Suarez [Sun, 29 Mar 2009 20:48:10 +0000 (22:48 +0200)]

Trivial merge