Merge commit 'origin/postfixwhen' into blead
authorRafael Garcia-Suarez <rgarciasuarez@gmail.com>
Sun, 29 Mar 2009 20:48:10 +0000 (22:48 +0200)
committerRafael Garcia-Suarez <rgarciasuarez@gmail.com>
Sun, 29 Mar 2009 20:48:10 +0000 (22:48 +0200)

Trivial merge