commit: Branche merge

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml-hwinfo/rev/80874aacbea0321c5e5f4bbd3e2b525fb0efc53f


changeset:   10:80874aacbea0321c5e5f4bbd3e2b525fb0efc53f
parent:      9:4eb428cdcf1ab1749e4fbbc0b380fd346ad40b15
parent:      6:439e85d8c8aa341dd55fff7cb692d5249bdefd0d
user:        Michael Prokop <mika at grml.org>
date:        Mon Jun 11 12:19:00 2007 +0200
files:       debian/changelog
description:
Branche merge