No need to have it ripped into two pieces, just making upcoming changes more complicated. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>