Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Sun, 23 May 2010 06:34:56 +0000 (08:34 +0200)
committerAndre Noll <maan@systemlinux.org>
Sun, 23 May 2010 06:34:56 +0000 (08:34 +0200)
1  2 
string.c

diff --cc string.c
Simple merge