commit: Merge heads

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/aamath/rev/102f03e538569e9e7550d92a012d50e4a6dbdac9


changeset:   7:102f03e538569e9e7550d92a012d50e4a6dbdac9
tag:         tip
parent:      6:89871bb76cec11a4ca6686623c3a68186cbd4ccb
parent:      5:71358dac2fa23cbcdf98ed871b7b4866cc44e2c5
user:        Michael Prokop <mika at grml.org>
date:        Thu Sep 13 12:23:54 2007 +0200
files:       
description:
Merge heads