commit: Merge branches

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml-live/rev/e7530371f234bd1d34374825500736b3855565c1


changeset:   186:e7530371f234bd1d34374825500736b3855565c1
tag:         tip
parent:      185:2a4ba3e7cc30c598643c84ab76e357b25e533ced
parent:      184:22b331ba6bbb0ecb3f6cc86bfa2cfd75f63d40c2
user:        Michael Prokop
date:        Thu Oct 18 00:43:29 2007 +0200
files:       buildd/main.sh debian/changelog
description:
Merge branches