As requested by:
Pavel Machek <pavel@suse.cz>

Pavel's other comments will be dealt with in later patches.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>