This time I did not break anything... and they shut up gcc4 ;)
Signed-off-by: NSam Ravnborg <sam@ravnborg.org>