Author: Martin Josefsson <gandalf@wlug.westbo.se>
Status: Submitted at 2.4.21-rc1 time

Fix problem with certain configurations failing to compile.

