commit 055850e7d925110322b8db4e17c3b840d76e144c
Merge: 7e4f6b4 4f13525
Author: Bodo Tasche <bodo@wannawork.de>
Date:   Thu Mar 25 21:02:04 2010 +0100

    Merge branch 'master' of a/bla2/../bla
