Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 2 Mar 2009 09:39:59 +0000 (10:39 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 2 Mar 2009 09:39:59 +0000 (10:39 +0100)
1  2 
error.h

diff --cc error.h
Simple merge