commit: Merge branches

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml-live/rev/676c6dd7088a5fad4c46b8d015686f7e9c233434


changeset:   309:676c6dd7088a5fad4c46b8d015686f7e9c233434
tag:         tip
parent:      308:317ecd49ec4543d92c22a52b6dec1e78078746b7
parent:      307:d2659919af3b3235c3ece9d3c40b15f3ec772671
user:        Michael Prokop
date:        Sun Nov 18 22:23:45 2007 +0100
files:       
description:
Merge branches