From: Tilman Schmidt <tilman@imap.cc>Date: Fri, 19 Jun 2009 20:24:53 +0200 (CEST)> Remove duplicates, a stray merge conflict marker, and an entry for a file> which doesn't exist, and move one entry to its correct alphabetical place.> > Signed-off-by: Tilman Schmidt <tilman@imap.cc>Applied, thanks.