Fixes small errors in merge files.
authorStéphane Jacob <sj@m4x.org>
Fri, 15 Oct 2010 16:16:54 +0000 (18:16 +0200)
committerStéphane Jacob <sj@m4x.org>
Fri, 15 Oct 2010 16:16:54 +0000 (18:16 +0200)
Signed-off-by: Stéphane Jacob <sj@m4x.org>

No differences found