Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Tue, 10 Feb 2009 22:08:20 +0000 (23:08 +0100)
committerAndre Noll <maan@systemlinux.org>
Tue, 10 Feb 2009 22:08:20 +0000 (23:08 +0100)
Conflicts:
adu.ggo
user.c

1  2 
interactive.c
user.c

diff --cc interactive.c
Simple merge
diff --cc user.c
Simple merge