Merge commit 'origin/stable'
authorJohn Darrington <john@darrington.wattle.id.au>
Wed, 22 Apr 2009 09:15:41 +0000 (17:15 +0800)
committerJohn Darrington <john@darrington.wattle.id.au>
Wed, 22 Apr 2009 09:15:41 +0000 (17:15 +0800)
Conflicts:

src/ui/gui/output-viewer.c


Trivial merge