merge

[Tollef Fog Heen <tfheen@raw.no>]

severity 214487 grave
severity 214465 grave
merge 214487 214465 
thanks

(I'll merge in my grave bug as soon as it is in the BTS)

-- 
Tollef Fog Heen                                                        ,''`.
UNIX is user friendly, it's just picky about who its friends are      : :' :
                                                                      `. `' 
                                                                        `-