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)
commit3bbb4370239deb29ebbf813d258aef6249e2a431
tree7c4e384c407e2de56e454f9bd536fdc6ad14223d
parent5151983c7f0faf00facba5dfaf6d17947337aa42
parentf463d854c12bda4f9f12f798ba12d3ea88c3a9ed
Merge commit 'origin/stable'

Conflicts:

NEWS
configure.ac
po/nl.po
src/ui/gui/dict-display.c
NEWS
doc/dev/system-file-format.texi
src/data/sys-file-reader.c