Merge commit 'origin/stable' fc11-i386-build58 fc11-x64-build55 lenny-x64-build79 sid-i386-build125
authorJohn Darrington <john@darrington.wattle.id.au>
Wed, 16 Dec 2009 20:09:55 +0000 (21:09 +0100)
committerJohn Darrington <john@darrington.wattle.id.au>
Wed, 16 Dec 2009 20:09:55 +0000 (21:09 +0100)
Conflicts:

NEWS
configure.ac
po/nl.po
src/ui/gui/dict-display.c


No differences found