Merge branch 't/hup_fix'
authorAndre Noll <maan@systemlinux.org>
Thu, 23 Jun 2011 17:13:40 +0000 (19:13 +0200)
committerAndre Noll <maan@systemlinux.org>
Thu, 23 Jun 2011 17:13:40 +0000 (19:13 +0200)
1  2 
aft.c

diff --cc aft.c
Simple merge