ooo-build r10104 - in branches/ooo-build-2-2: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: 2007-08-21 13:12:29 +0100 (Tue, 21 Aug 2007)
New Revision: 10104
ViewCVS link: http://svn.gnome.org/viewcvs/ooo-build?rev=10104&view=rev

Modified:
   branches/ooo-build-2-2/ChangeLog
   branches/ooo-build-2-2/patches/src680/ooo59127.vcl.honourcairofont.diff
Log:
merge from trunk:

2007-08-21  Chris Cheney  <ccheney ubuntu com>

        * patches/src680/ooo59127.vcl.honourcairofont.diff: fix for gdk hang.