next-20100611 /usr
janitor patch

signed-off-by: UndiFineD <k.dejong@undifined.nl>