Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 26 May 2008 09:24:34 +0000 (11:24 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 26 May 2008 09:24:34 +0000 (11:24 +0200)
commit2cfa8c8aaa4662f44bc7e7cd4d3591ed6e1326bd
treeb0e565a6fd7be9a01b122f3ef4f1d552a27faf21
parent3ebfb15c8a53bd1e1fbd0d5f8d4f00c7eeb76fd0
parent6c043b44a1cec206f3b4f8063fb8383e66ae6d53
Merge commit 'meins/master'

Conflicts:

Makefile
adu.c
Makefile
adu.c