Several updates, libwebkit patched for n32

10 files changed, 67 insertions, 2075 deletions

diff --git a/extra/abiword/PKGBUILD b/extra/abiword/PKGBUILD
deleted file mode 100644
index 996d0d980..000000000
--- a/extra/abiword/PKGBUILD
+++ /dev/null
@@ -1,88 +0,0 @@
-# $Id: PKGBUILD 102234 2010-12-06 22:32:25Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Maël Lavault <moimael@neuf.fr>
-
-pkgbase=abiword-libre
-pkgname=('abiword-libre' 'abiword-libre-plugins')
-pkgver=2.8.6
-pkgrel=4
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.abisource.com"
-makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv'
-'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg'
-'librsvg' 'loudmouth' 'libsoup')
-options=('!makeflags' '!libtool')
-source=("http://repo.parabolagnulinux.org/other/${pkgbase}-${pkgver}.tar.gz"
-        liberation-fonts.patch
-        compat_libwpg_0_9.patch)
-conflicts=('abiword')
-replaces=('abiword')
-provides=("abiword=$pkgver")
-
-
-# source PKGBUILD; mksource
-mksource() {
-  wget http://www.abisource.com/downloads/abiword/${pkgver}/source/abiword-${pkgver}.tar.gz | \
-    tar xzf -
-
-  pushd abiword-${pkgver}
-  #find -type f -print0 | xargs -0 sed -i "s:Times New Roman:Liberation Serif:g"
-  patch -Np1 -i ../liberation-fonts.patch || return 1
-  popd
-
-  mv abiword-${pkgver} ${pkgbase}-${pkgver}
-  tar czf ${pkgbase}-${pkgver}.tar.gz ${pkgbase}-${pkgver}/
-
-  rm -r ${pkgbase}-${pkgver}/
-
-}
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/compat_libwpg_0_9.patch"
-  libtoolize --force
-  autoreconf
-
-  ./configure --prefix=/usr --enable-clipart --enable-templates \
-              --enable-collab-backend-xmpp --enable-collab-backend-tcp \
-              --enable-collab-backend-service --disable-collab-backend-sugar \
-              --enable-plugins --without-gnomevfs --with-gio --with-goffice \
-              --disable-static --with-psiconv-config=/nothere 
-
-
-  sed -ir 's/--no-undefined/-no-undefined/' src/Makefile
-  make
-}
-
-package_abiword() {
-  pkgdesc="A fully-featured word processor that doesn't recommend unfree fonts"
-  depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant')
-  optdepends=('abiword-plugins')
-  conflicts=("abiword-plugins<${pkgver}-${pkgrel}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -i plugins/Makefile \
-      -e 's/ collab / /' \
-      -e 's/ wpg / /' \
-      -e 's/ wmf / /' \
-      -e 's/ grammar / /' \
-      -e 's/ mathview / /' \
-      -e 's/ aiksaurus / /' \
-      -e 's/ latex / /' \
-      -e 's/ ots / /' \
-      -e 's/ wordperfect / /'
-  make DESTDIR="${pkgdir}" install
-}
-
-package_abiword-libre-plugins() {
-  pkgdesc="Additional plugins for Abiword"
-  depends=("abiword-libre=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf'
-           'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/plugins"
-  for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do
-    make -C ${dir} DESTDIR="${pkgdir}" install
-  done
-}
diff --git a/extra/abiword/compat_libwpg_0_9.patch b/extra/abiword/compat_libwpg_0_9.patch
deleted file mode 100644
index cf36e188e..000000000
--- a/extra/abiword/compat_libwpg_0_9.patch
+++ /dev/null
@@ -1,371 +0,0 @@
-diff -Nur abiword-2.8.6.orig//plugin-configure.m4 abiword-2.8.6/plugin-configure.m4
---- abiword-2.8.6.orig//plugin-configure.m4	2010-06-13 14:17:27.000000000 -0700
-+++ abiword-2.8.6/plugin-configure.m4	2010-12-06 13:59:43.083048588 -0800
-@@ -794,7 +794,7 @@
- AC_SUBST([OPENXML_LIBS])
- 
- 
--wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0"
-+wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
- wpg_deps="no"
- 
- if test "$enable_wpg" != ""; then
-@@ -1497,8 +1497,8 @@
- AC_SUBST([EML_LIBS])
- 
- 
--wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0'
-+wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
-+wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
-diff -Nur abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 abiword-2.8.6/plugins/wordperfect/plugin.m4
---- abiword-2.8.6.orig//plugins/wordperfect/plugin.m4	2010-05-30 07:50:46.000000000 -0700
-+++ abiword-2.8.6/plugins/wordperfect/plugin.m4	2010-12-06 13:59:53.929715254 -0800
-@@ -1,6 +1,6 @@
- 
--wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0'
-+wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
-+wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
- wordperfect_deps="no"
- 
- WORDPERFECT_CFLAGS=
-diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
---- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp	2010-02-06 13:06:11.000000000 -0800
-+++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp	2010-12-06 13:59:53.926381921 -0800
-@@ -60,7 +60,7 @@
- 
- // Stream class
- 
--#include <libwpd/WPXStream.h>
-+#include <libwpd-stream/libwpd-stream.h>
- 
- #include <gsf/gsf-input.h>
- #include <gsf/gsf-infile.h>
-@@ -70,12 +70,7 @@
- #include <libwps/libwps.h>
- #endif
- 
--class AbiWordperfectInputStream :
--#ifdef HAVE_LIBWPS
--	public WPSInputStream
--#else
--    public WPXInputStream
--#endif
-+class AbiWordperfectInputStream : public WPXInputStream
- {
- public:
- 	AbiWordperfectInputStream(GsfInput *input);
-@@ -86,7 +81,7 @@
- 
- 	virtual WPXInputStream * getDocumentOLEStream(const char * name);
- 
--	virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead);
-+	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
- 	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
- 	virtual long tell();
- 	virtual bool atEOS();
-@@ -98,11 +93,7 @@
- };
- 
- AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) :
--#ifdef HAVE_LIBWPS
--	WPSInputStream(),
--#else
--	WPXInputStream(true),
--#endif
-+	WPXInputStream(),
- 	m_input(input),
- 	m_ole(NULL)
- {
-@@ -117,9 +108,9 @@
- 	g_object_unref(G_OBJECT(m_input));
- }
- 
--const uint8_t * AbiWordperfectInputStream::read(size_t numBytes, size_t &numBytesRead)
-+const unsigned char * AbiWordperfectInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
- {
--	const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL);
-+	const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL);
- 
- 	if (buf == NULL)
- 		numBytesRead = 0;
-@@ -256,19 +247,12 @@
- {
- 	AbiWordperfectInputStream gsfInput(input);
- 
--	WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput, true);
-+	WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput);
- 
- 	switch (confidence)
- 	{
- 		case WPD_CONFIDENCE_NONE:
--		// libwpd > 0.7.1 reports POOR if the text file is plain text (that _could_ be a WP4x document)
--		// however, we'll let the text importer handle such cases
--		case WPD_CONFIDENCE_POOR: 
- 			return UT_CONFIDENCE_ZILCH;
--		case WPD_CONFIDENCE_LIKELY:
--			return UT_CONFIDENCE_SOSO;
--		case WPD_CONFIDENCE_GOOD:
--			return UT_CONFIDENCE_GOOD;
- 		case WPD_CONFIDENCE_EXCELLENT:
- 			return UT_CONFIDENCE_PERFECT;
- 		default:
-@@ -328,7 +312,7 @@
- UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input)
- {
- 	AbiWordperfectInputStream gsfInput(input);
--	WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this));
-+	WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this), NULL);
- 
- 	if (error != WPD_OK)
- 	{
-@@ -381,9 +365,9 @@
- 	float marginLeft = 1.0f, marginRight = 1.0f;
- 
- 	if (propList["fo:margin-left"])
--		marginLeft = propList["fo:margin-left"]->getFloat();
-+		marginLeft = propList["fo:margin-left"]->getDouble();
- 	if (propList["fo:margin-right"])
--		marginRight = propList["fo:margin-right"]->getFloat();
-+		marginRight = propList["fo:margin-right"]->getDouble();
- 
- 	if (marginLeft != m_leftPageMargin || marginRight != m_rightPageMargin /* || */
- 		/* marginTop != m_marginBottom || marginBottom != m_marginBottom */ )
-@@ -456,15 +440,15 @@
- 	float marginTop = 0.0f, marginBottom = 0.0f;
- 	float marginLeft = 0.0f, marginRight = 0.0f, textIndent = 0.0f;
- 	if (propList["fo:margin-top"])
--	    marginTop = propList["fo:margin-top"]->getFloat();
-+	    marginTop = propList["fo:margin-top"]->getDouble();
- 	if (propList["fo:margin-bottom"])
--	    marginBottom = propList["fo:margin-bottom"]->getFloat();
-+	    marginBottom = propList["fo:margin-bottom"]->getDouble();
- 	if (propList["fo:margin-left"])
--	    marginLeft = propList["fo:margin-left"]->getFloat();
-+	    marginLeft = propList["fo:margin-left"]->getDouble();
- 	if (propList["fo:margin-right"])
--	    marginRight = propList["fo:margin-right"]->getFloat();
-+	    marginRight = propList["fo:margin-right"]->getDouble();
- 	if (propList["fo:text-indent"])
--	    textIndent = propList["fo:text-indent"]->getFloat();
-+	    textIndent = propList["fo:text-indent"]->getDouble();
- 
- 	m_topMargin = marginTop;
- 	m_bottomMargin = marginBottom;
-@@ -487,7 +471,7 @@
- 
- 	float lineSpacing = 1.0f;
- 	if (propList["fo:line-height"])
--		lineSpacing = propList["fo:line-height"]->getFloat();
-+		lineSpacing = propList["fo:line-height"]->getDouble();
- 	
- 	UT_String tmpBuffer;
- 	UT_String_sprintf(tmpBuffer, "; margin-top:%.4fin; margin-bottom:%.4fin; margin-left:%.4fin; margin-right:%.4fin; text-indent:%.4fin; line-height:%.4f",
-@@ -504,7 +488,7 @@
- 			propBuffer += tmpBuffer;
- 			if (i()["style:position"])
- 			{
--				UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getFloat());
-+				UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getDouble());
- 				propBuffer += tmpBuffer;
- 			}
- 
-@@ -640,9 +624,9 @@
- 
- 	// TODO: support spaceAfter
- 	if (propList["fo:margin-left"])
--		marginLeft = propList["fo:margin-left"]->getFloat();
-+		marginLeft = propList["fo:margin-left"]->getDouble();
- 	if (propList["fo:margin-right"])
--		marginRight = propList["fo:margin-right"]->getFloat();
-+		marginRight = propList["fo:margin-right"]->getDouble();
- 
- 	if (marginLeft != m_leftSectionMargin || marginRight != m_rightSectionMargin || m_sectionColumnsCount != columnsCount)
- 		m_bSectionChanged = true;
-@@ -709,9 +693,9 @@
- 	if (propList["style:num-format"])
- 		listType = propList["style:num-format"]->getStr().cstr()[0];
- 	if (propList["text:space-before"])
--		listLeftOffset = propList["text:space-before"]->getFloat();
-+		listLeftOffset = propList["text:space-before"]->getDouble();
- 	if (propList["text:min-label-width"])
--		listMinLabelWidth = propList["text:min-label-width"]->getFloat();
-+		listMinLabelWidth = propList["text:min-label-width"]->getDouble();
- 
- 	if (!m_pCurrentListDefinition || 
- 		m_pCurrentListDefinition->getOutlineHash() != listID ||
-@@ -749,9 +733,9 @@
- 	if (propList["libwpd:level"])
- 		level = propList["libwpd:level"]->getInt();
- 	if (propList["text:space-before"])
--		listLeftOffset = propList["text:space-before"]->getFloat();
-+		listLeftOffset = propList["text:space-before"]->getDouble();
- 	if (propList["text:min-label-width"])
--		listMinLabelWidth = propList["text:min-label-width"]->getFloat();
-+		listMinLabelWidth = propList["text:min-label-width"]->getDouble();
- 
- 	if (!m_pCurrentListDefinition || m_pCurrentListDefinition->getOutlineHash() != listID)
- 	{
-@@ -871,10 +855,10 @@
- 
- 	UT_String_sprintf(tempBuffer, "margin-left:%.4fin; ", m_pCurrentListDefinition->getListLeftOffset(m_iCurrentListLevel)
- 					+ m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel)
--					- (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f));
-+					- (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f));
- 	propBuffer += tempBuffer;
- 	UT_String_sprintf(tempBuffer, "text-indent:%.4fin", - m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel)
--					+ (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f));
-+					+ (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f));
- 	propBuffer += tempBuffer;
- 
- 	listAttribs[attribsCount++] = PT_PROPS_ATTRIBUTE_NAME;
-@@ -1263,7 +1247,7 @@
-     virtual UT_Error _loadFile(GsfInput * input)
- 	{
- 		AbiWordperfectInputStream gsfInput(input);
--		WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this));
-+		WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this));
- 
- 		if (error != WPS_OK)
- 			{
-@@ -1302,18 +1286,12 @@
- {
- 	AbiWordperfectInputStream gsfInput(input);
- 
--	WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput, true);
-+	WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput);
- 
- 	switch (confidence)
- 	{
- 		case WPS_CONFIDENCE_NONE:
- 			return UT_CONFIDENCE_ZILCH;
--		case WPS_CONFIDENCE_POOR: 
--			return UT_CONFIDENCE_POOR;
--		case WPS_CONFIDENCE_LIKELY:
--			return UT_CONFIDENCE_SOSO;
--		case WPS_CONFIDENCE_GOOD:
--			return UT_CONFIDENCE_GOOD;
- 		case WPS_CONFIDENCE_EXCELLENT:
- 			return UT_CONFIDENCE_PERFECT;
- 		default:
-diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h
---- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h	2009-06-19 01:55:49.000000000 -0700
-+++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h	2010-12-06 13:59:53.929715254 -0800
-@@ -30,13 +30,7 @@
- #define IE_IMP_WP_H
- 
- #include <stdio.h>
--#ifdef _WIN32
--#define POINT WPX_POINT
--#endif
- #include <libwpd/libwpd.h>
--#ifdef _WIN32
--#undef POINT
--#endif
- #include "ie_imp.h"
- #include "ut_string.h"
- #include "ut_string_class.h"
-@@ -98,7 +92,7 @@
- 					IE_Imp ** ppie);
- };
- 
--class IE_Imp_WordPerfect : public IE_Imp, public WPXHLListenerImpl
-+class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface
- {
- public:
-     IE_Imp_WordPerfect(PD_Document * pDocument);
-@@ -154,6 +148,21 @@
-     virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {}
-     virtual void closeTable();
- 
-+    virtual void definePageStyle(const WPXPropertyList&) {}
-+    virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
-+    virtual void defineCharacterStyle(const WPXPropertyList&) {}
-+    virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
-+    virtual void insertSpace() {}
-+    virtual void insertField(const WPXString&, const WPXPropertyList&) {}
-+    virtual void openComment(const WPXPropertyList&) {}
-+    virtual void closeComment() {}
-+    virtual void openTextBox(const WPXPropertyList&) {}
-+    virtual void closeTextBox() {}
-+    virtual void openFrame(const WPXPropertyList&) {}
-+    virtual void closeFrame() {}
-+    virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {}
-+    virtual void insertEquation(const WPXPropertyList&, const WPXString&) {}
-+
-     
- protected:
- 	virtual UT_Error _loadFile(GsfInput * input);
-diff -Nur abiword-2.8.6.orig//plugins/wpg/plugin.m4 abiword-2.8.6/plugins/wpg/plugin.m4
---- abiword-2.8.6.orig//plugins/wpg/plugin.m4	2010-05-30 07:50:46.000000000 -0700
-+++ abiword-2.8.6/plugins/wpg/plugin.m4	2010-12-06 13:59:53.929715254 -0800
-@@ -1,5 +1,5 @@
- 
--wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0"
-+wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
- wpg_deps="no"
- 
- if test "$enable_wpg" != ""; then
-diff -Nur abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp
---- abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp	2008-08-15 14:52:32.000000000 -0700
-+++ abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp	2010-12-06 13:59:53.923048588 -0800
-@@ -31,11 +31,10 @@
- #include <gsf/gsf-input-memory.h>
- #include <gsf/gsf-input-stdio.h>
- #include <gsf/gsf-infile-msole.h>
--#include <libwpd/WPXStream.h>
-+#include <libwpd-stream/libwpd-stream.h>
- #include "xap_Module.h"
- 
- using libwpg::WPGraphics;
--using libwpg::WPGString;
- 
- ABI_PLUGIN_DECLARE("WPG")
- 
-@@ -48,7 +47,7 @@
- 	virtual bool isOLEStream();
- 	virtual WPXInputStream * getDocumentOLEStream();
- 	virtual WPXInputStream * getDocumentOLEStream(const char * name);
--	virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead);
-+	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
- 	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
- 	virtual long tell();
- 	virtual bool atEOS();
-@@ -60,7 +59,7 @@
- };
- 
- AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) :
--	WPXInputStream(true),
-+	WPXInputStream(),
- 	m_input(input),
- 	m_ole(NULL)
- {
-@@ -75,9 +74,9 @@
- 	g_object_unref(G_OBJECT(m_input));
- }
- 
--const uint8_t * AbiWordPerfectGraphicsInputStream::read(size_t numBytes, size_t &numBytesRead)
-+const unsigned char * AbiWordPerfectGraphicsInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
- {
--	const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL);
-+	const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL);
- 
- 	if (buf == NULL)
- 		numBytesRead = 0;
-@@ -245,10 +244,10 @@
- UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg)
- {
- 	AbiWordPerfectGraphicsInputStream gsfInput(input);
--	WPGString svgOutput;
-+	WPXString svgOutput;
- 	if (WPGraphics::generateSVG(&gsfInput, svgOutput))
- 	{
--		GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.length(), false);
-+		GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false);
- 		UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg);
- 		g_object_unref(svgInput);
- 		return result;
diff --git a/extra/abiword/liberation-fonts.patch b/extra/abiword/liberation-fonts.patch
deleted file mode 100644
index 9910feef8..000000000
--- a/extra/abiword/liberation-fonts.patch
+++ /dev/null
@@ -1,1606 +0,0 @@
-diff -auNpr abiword-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp abiword-libre-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp
---- abiword-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp	2009-07-20 16:22:04.000000000 -0300
-+++ abiword-libre-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp	2011-07-02 15:37:16.397564815 -0300
-@@ -1062,7 +1062,7 @@ void s_LaTeX_Listener::_openSpan(PT_Attr
- 				m_pie->write("\\texttt{");
- 				m_NumCloseBrackets++;
- 			}
--			if (!strcmp("Arial", szValue) ||
-+			if (!strcmp("Liberation Sans", szValue) ||
- 				!strcmp("Helvetic", szValue) ||
- 				!strcmp("Luxi Sans",szValue)) {
- 				m_pie->write("\\textsf{");
-diff -auNpr abiword-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp abiword-libre-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp
---- abiword-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp	2008-04-20 11:44:51.000000000 -0300
-+++ abiword-libre-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp	2011-07-02 15:37:12.791762814 -0300
-@@ -59,7 +59,7 @@ void ODi_FontFaceDecls::startElement (co
-         fontFamily = pFontFamily;
- 
-         if (pFontFamily && (pFontFamily[0] == '\'') && (pFontFamily[strlen(pFontFamily)-1] == '\'')) {
--            // e.g.:  Turns a "'Times New Roman'" into a "Times New Roman".
-+            // e.g.:  Turns a "'Liberation Serif'" into a "Liberation Serif".
-             // OpenOffice.org sometimes adds those extra "'" surrounding the
-             // font family name if it's composed by more than one word.
-             m_fontFamilies[pStyleName] =
-diff -auNpr abiword-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp abiword-libre-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp
---- abiword-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp	2009-06-25 18:29:32.000000000 -0300
-+++ abiword-libre-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp	2011-07-02 15:37:16.561646815 -0300
-@@ -899,12 +899,12 @@ bool OO_StylesWriter::writeStyles(PD_Doc
-     {	   
-       "<office:styles>\n",
-       "<style:default-style style:family=\"graphics\">\n",
--      "<style:properties draw:start-line-spacing-horizontal=\"0.283cm\" draw:start-line-spacing-vertical=\"0.283cm\" draw:end-line-spacing-horizontal=\"0.283cm\" draw:end-line-spacing-vertical=\"0.283cm\" fo:color=\"#000000\" style:font-name=\"Nimbus Roman No9 L\" fo:font-size=\"12pt\" fo:language=\"en\" fo:country=\"US\" style:font-name-asian=\"HG Mincho Light J\" style:font-size-asian=\"12pt\" style:language-asian=\"none\" style:country-asian=\"none\" style:font-name-complex=\"Arial Unicode MS\" style:font-size-complex=\"12pt\" style:language-complex=\"none\" style:country-complex=\"none\" style:text-autospace=\"ideograph-alpha\" style:punctuation-wrap=\"simple\" style:line-break=\"strict\">\n",
-+      "<style:properties draw:start-line-spacing-horizontal=\"0.283cm\" draw:start-line-spacing-vertical=\"0.283cm\" draw:end-line-spacing-horizontal=\"0.283cm\" draw:end-line-spacing-vertical=\"0.283cm\" fo:color=\"#000000\" style:font-name=\"Nimbus Roman No9 L\" fo:font-size=\"12pt\" fo:language=\"en\" fo:country=\"US\" style:font-name-asian=\"HG Mincho Light J\" style:font-size-asian=\"12pt\" style:language-asian=\"none\" style:country-asian=\"none\" style:font-name-complex=\"Liberation Sans Unicode MS\" style:font-size-complex=\"12pt\" style:language-complex=\"none\" style:country-complex=\"none\" style:text-autospace=\"ideograph-alpha\" style:punctuation-wrap=\"simple\" style:line-break=\"strict\">\n",
-       "<style:tab-stops/>\n",
-       "</style:properties>\n",
-       "</style:default-style>\n",
-       "<style:default-style style:family=\"paragraph\">\n",
--      "<style:properties fo:color=\"#000000\" style:font-name=\"Nimbus Roman No9 L\" fo:font-size=\"12pt\" fo:language=\"en\" fo:country=\"US\" style:font-name-asian=\"HG Mincho Light J\" style:font-size-asian=\"12pt\" style:language-asian=\"none\" style:country-asian=\"none\" style:font-name-complex=\"Arial Unicode MS\" style:font-size-complex=\"12pt\" style:language-complex=\"none\" style:country-complex=\"none\" fo:hyphenate=\"false\" fo:hyphenation-remain-char-count=\"2\" fo:hyphenation-push-char-count=\"2\" fo:hyphenation-ladder-count=\"no-limit\" style:text-autospace=\"ideograph-alpha\" style:punctuation-wrap=\"hanging\" style:line-break=\"strict\" style:tab-stop-distance=\"2.205cm\"/>\n",
-+      "<style:properties fo:color=\"#000000\" style:font-name=\"Nimbus Roman No9 L\" fo:font-size=\"12pt\" fo:language=\"en\" fo:country=\"US\" style:font-name-asian=\"HG Mincho Light J\" style:font-size-asian=\"12pt\" style:language-asian=\"none\" style:country-asian=\"none\" style:font-name-complex=\"Liberation Sans Unicode MS\" style:font-size-complex=\"12pt\" style:language-complex=\"none\" style:country-complex=\"none\" fo:hyphenate=\"false\" fo:hyphenation-remain-char-count=\"2\" fo:hyphenation-push-char-count=\"2\" fo:hyphenation-ladder-count=\"no-limit\" style:text-autospace=\"ideograph-alpha\" style:punctuation-wrap=\"hanging\" style:line-break=\"strict\" style:tab-stop-distance=\"2.205cm\"/>\n",
-       "</style:default-style>\n"
-     };
-   
-diff -auNpr abiword-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp
---- abiword-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp	2008-01-16 15:02:48.000000000 -0200
-+++ abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp	2011-07-02 15:37:13.944338815 -0300
-@@ -34,7 +34,7 @@
- #include <string>
- 
- OXML_FontManager::OXML_FontManager() : 
--	m_defaultFont("Times New Roman")
-+	m_defaultFont("Liberation Serif")
- {
- 	m_major_rts.clear();
- 	m_minor_rts.clear();
-diff -auNpr abiword-2.8.6/plugins/openxml/common/xp/OXML_List.cpp abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_List.cpp
---- abiword-2.8.6/plugins/openxml/common/xp/OXML_List.cpp	2009-07-02 12:20:55.000000000 -0300
-+++ abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_List.cpp	2011-07-02 15:37:13.960346815 -0300
-@@ -258,7 +258,7 @@ UT_Error OXML_List::serialize(IE_Exp_Ope
- 			txt = txt.replace(index+1, 1, 1, '1'+i);
- 		}
- 	
--		std::string fontFamily("Times New Roman");
-+		std::string fontFamily("Liberation Serif");
- 		const gchar* listType = "bullet";
- 		switch(type)
- 		{
-diff -auNpr abiword-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp abiword-libre-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp
---- abiword-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp	2009-05-07 18:45:16.000000000 -0300
-+++ abiword-libre-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp	2011-07-02 15:37:14.172452815 -0300
-@@ -318,7 +318,7 @@ void Passepartout_Listener::_openBlock(P
-                  }
- 		else
-                  {
--                   TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Times New Roman" );
-+                   TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Liberation Serif" );
-                    m_pie->write(TempStr.utf8_str());
-                  }
- 
-@@ -426,7 +426,7 @@ void Passepartout_Listener::_openFont(PT
-                  }
- 		else
-                  {
--                   TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Times New Roman" );
-+                   TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Liberation Serif" );
-                    m_pie->write(TempStr.utf8_str());
-                  }
- 
-diff -auNpr abiword-2.8.6/plugins/t602/xp/ie_imp_T602.cpp abiword-libre-2.8.6/plugins/t602/xp/ie_imp_T602.cpp
---- abiword-2.8.6/plugins/t602/xp/ie_imp_T602.cpp	2009-01-04 18:34:28.000000000 -0200
-+++ abiword-libre-2.8.6/plugins/t602/xp/ie_imp_T602.cpp	2011-07-02 15:37:14.676704815 -0300
-@@ -620,7 +620,7 @@ switch (c)
-      case 0x01:
- 	m_sfont ^=1;
- 	if (m_sfont & 1)
--	  { m_size=static_cast<int>(0.8*m_basesize); m_family="Arial"; 
-+	  { m_size=static_cast<int>(0.8*m_basesize); m_family="Liberation Sans"; 
- 		  /* FIXME? -> .profile?*/ }
- 	else
- 	  { m_size=m_basesize; m_family=m_basefamily; }
-diff -auNpr abiword-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp abiword-libre-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
---- abiword-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp	2009-09-04 09:40:10.000000000 -0300
-+++ abiword-libre-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp	2011-07-02 15:36:53.578160816 -0300
-@@ -182,7 +182,7 @@ GR_Font * GR_UnixCairoGraphics::getGUIFo
- 		GtkStyle *tempStyle = gtk_style_new();
- 		const char *guiFontName = pango_font_description_get_family(tempStyle->font_desc);
- 		if (!guiFontName)
--			guiFontName = "'Times New Roman'";
-+			guiFontName = "'Liberation Serif'";
- 
- 		UT_UTF8String s = XAP_EncodingManager::get_instance()->getLanguageISOName();
- 
-diff -auNpr abiword-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp abiword-libre-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp
---- abiword-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp	2010-04-14 18:13:41.000000000 -0300
-+++ abiword-libre-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp	2011-07-02 15:36:53.918330816 -0300
-@@ -756,8 +756,8 @@ bool GR_CairoGraphics::shape(GR_ShapingI
- 
- 	/*
- 	 * Pango does a royally bad job of the font substitution in
--	 * pango_itemize(): it will happily return 'Times New Roman' as
--	 * font when we have requested 'Arial', even though the latter is
-+	 * pango_itemize(): it will happily return 'Liberation Serif' as
-+	 * font when we have requested 'Liberation Sans', even though the latter is
- 	 * present and has the necessary coverage. Consequently we have to
- 	 * do the font substitution manually even on the first shapping.
- 	 *
-@@ -2931,7 +2931,7 @@ GR_Font * GR_CairoGraphics::getDefaultFo
- 
- 		case GR_Font::FF_Technical:
- 		case GR_Font::FF_BiDi:
--			pszFontFamily = "Arial";
-+			pszFontFamily = "Liberation Sans";
- 			break;
- 			
- 		default:
-diff -auNpr abiword-2.8.6/src/af/util/xp/ut_misc.cpp abiword-libre-2.8.6/src/af/util/xp/ut_misc.cpp
---- abiword-2.8.6/src/af/util/xp/ut_misc.cpp	2009-06-28 19:09:08.000000000 -0300
-+++ abiword-libre-2.8.6/src/af/util/xp/ut_misc.cpp	2011-07-02 15:36:54.746744816 -0300
-@@ -606,7 +606,7 @@ const gchar ** UT_setPropsToValue(const
- }
- 
- /*!
--   splits the xml property string (font-size:24pt;font-face:Arial') into names and values
-+   splits the xml property string (font-size:24pt;font-face:Liberation Sans') into names and values
-    and stores them in an array
- 
-    the caller has to delete[] the array; the process is destructive to props
-diff -auNpr abiword-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib abiword-libre-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib
---- abiword-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib	2005-08-02 02:31:06.000000000 -0300
-+++ abiword-libre-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib	2011-07-02 15:36:51.257000816 -0300
-@@ -10910,7 +10910,7 @@
- 				<integer>624</integer>
- 			</dict>
- 		</dict>
--		<string>Times New Roman</string>
-+		<string>Liberation Serif</string>
- 		<string>_popUpItemAction:</string>
- 		<dict>
- 			<key>$class</key>
-diff -auNpr abiword-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp abiword-libre-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp
---- abiword-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp	2009-09-01 11:49:33.000000000 -0300
-+++ abiword-libre-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp	2011-07-02 15:36:50.404574816 -0300
-@@ -878,7 +878,7 @@ gint XAP_UnixDialog_FileOpenSaveAs::prev
- 
- 	const gchar * file_name = gtk_file_chooser_get_uri (m_FC);
- 	
--	GR_Font * fnt = pGr->findFont("Times New Roman",
-+	GR_Font * fnt = pGr->findFont("Liberation Serif",
- 								  "normal", "", "normal",
- 								  "", "12pt",
- 								  pSS->getLanguageName());
-diff -auNpr abiword-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp abiword-libre-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp
---- abiword-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp	2009-07-08 05:17:51.000000000 -0300
-+++ abiword-libre-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp	2011-07-02 15:36:50.788766816 -0300
-@@ -258,7 +258,7 @@ void XAP_Win32Dialog_About::runModal(XAP
- 	lf.lfWeight = 0;
- 	HFONT hfontSmall = CreateFontIndirect(&lf);
- 
--	strcpy(lf.lfFaceName, "Arial");
-+	strcpy(lf.lfFaceName, "Liberation Sans");
- 	lf.lfHeight = 36;
- 	lf.lfWeight = FW_BOLD; 
- 	HFONT hfontHeading = CreateFontIndirect(&lf);
-diff -auNpr abiword-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp
---- abiword-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp	2009-05-30 11:03:24.000000000 -0300
-+++ abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp	2011-07-02 15:36:52.893818816 -0300
-@@ -569,7 +569,7 @@ void XAP_Preview_FontPreview::draw(void)
- 	std::string sWeight = getVal("font-weight");
- 
- 	if(sFamily.empty())
--		sFamily = "Times New Roman";
-+		sFamily = "Liberation Serif";
- 
- 	if(sStyle.empty())
- 		sStyle = "normal";
-diff -auNpr abiword-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp
---- abiword-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp	2007-01-16 20:17:27.000000000 -0300
-+++ abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp	2011-07-02 15:36:52.681712816 -0300
-@@ -124,7 +124,7 @@ void XAP_Dialog_Zoom::_createPreviewFrom
- 	UT_ASSERT(m_zoomPreview);
- 	
- 	m_zoomPreview->setWindowSize(width, height);
--	m_zoomPreview->setString("10-pt Times New Roman");
-+	m_zoomPreview->setString("10-pt Liberation Serif");
- 	m_zoomPreview->setFont(XAP_Preview_Zoom::font_NORMAL);
- 	m_zoomPreview->setZoomPercent(m_zoomPercent);
- 
-diff -auNpr abiword-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp abiword-libre-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp
---- abiword-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp	2009-10-29 14:47:05.000000000 -0300
-+++ abiword-libre-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp	2011-07-02 15:36:52.753748816 -0300
-@@ -63,7 +63,7 @@ void XAP_Preview_Zoom::setFont(XAP_Previ
- 	{
- 	case XAP_Preview_Zoom::font_NORMAL:
- 		sprintf (fontString, "%dpt", (10 * m_zoomPercent / 100));
--		found = m_gc->findFont("Times New Roman",
-+		found = m_gc->findFont("Liberation Serif",
- 							   "normal", "", "normal",
- 							   "", fontString,
- 							   NULL);
-diff -auNpr abiword-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp abiword-libre-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp
---- abiword-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp	2010-06-13 11:02:39.000000000 -0300
-+++ abiword-libre-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp	2011-07-02 15:37:06.980858815 -0300
-@@ -9733,7 +9733,7 @@ void	fl_BlockLayout::StartList( const gc
- 		{
- 			FL_ListType lType = getListTypeFromStyle(szListStyle);
- 			if(IS_NUMBERED_LIST_TYPE(lType))
--				szFont = "Times New Roman";
-+				szFont = "Liberation Serif";
- 			else
- 				szFont = "symbol";
- 			UT_ASSERT(0);
-diff -auNpr abiword-2.8.6/src/text/fmt/xp/fp_Line.cpp abiword-libre-2.8.6/src/text/fmt/xp/fp_Line.cpp
---- abiword-2.8.6/src/text/fmt/xp/fp_Line.cpp	2009-09-09 03:20:32.000000000 -0300
-+++ abiword-libre-2.8.6/src/text/fmt/xp/fp_Line.cpp	2011-07-02 15:37:07.265000815 -0300
-@@ -1273,7 +1273,7 @@ void fp_Line::_doClearScreenFromRunToEnd
- 		pRun = m_vecRuns.getNthItem(_getRunLogIndx(runIndex));
- 
- 		// Handle case where character extends behind the left side
--		// like italic Times New Roman f. Clear a litle bit before if
-+		// like italic Liberation Serif f. Clear a litle bit before if
- 		// there is clear screen there
- 		UT_sint32 j = runIndex - 1;
- 
-diff -auNpr abiword-2.8.6/src/text/fmt/xp/fp_TextRun.cpp abiword-libre-2.8.6/src/text/fmt/xp/fp_TextRun.cpp
---- abiword-2.8.6/src/text/fmt/xp/fp_TextRun.cpp	2010-04-14 18:49:37.000000000 -0300
-+++ abiword-libre-2.8.6/src/text/fmt/xp/fp_TextRun.cpp	2011-07-02 15:37:08.021378815 -0300
-@@ -1434,7 +1434,7 @@ void fp_TextRun::_clearScreen(bool /* bF
- 	
- 	//
- 	// Handle case where character extend behind the left side
--	// like italic Times New Roman f
-+	// like italic Liberation Serif f
- 	//
- 	fp_Line * thisLine = getLine();
- 	fp_Run * pPrev = getPrevRun();
-diff -auNpr abiword-2.8.6/src/text/fmt/xp/fv_View.cpp abiword-libre-2.8.6/src/text/fmt/xp/fv_View.cpp
---- abiword-2.8.6/src/text/fmt/xp/fv_View.cpp	2010-06-13 11:02:39.000000000 -0300
-+++ abiword-libre-2.8.6/src/text/fmt/xp/fv_View.cpp	2011-07-02 15:37:08.353544815 -0300
-@@ -519,9 +519,9 @@ FV_View::FV_View(XAP_App * pApp, void* p
- 		s += pCountry;
- 	}
- 		
--	// do a fuzzy match for Times New Roman
-+	// do a fuzzy match for Liberation Serif
- 	const char * pszFamily =
--		GR_Graphics::findNearestFont ("Times New Roman",
-+		GR_Graphics::findNearestFont ("Liberation Serif",
- 									  "normal", "normal",
- 									  "normal", "normal",
- 									  "12pt", s.utf8_str());
-diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pp_Property.cpp abiword-libre-2.8.6/src/text/ptbl/xp/pp_Property.cpp
---- abiword-2.8.6/src/text/ptbl/xp/pp_Property.cpp	2009-05-18 23:33:18.000000000 -0300
-+++ abiword-libre-2.8.6/src/text/ptbl/xp/pp_Property.cpp	2011-07-02 15:37:09.053894814 -0300
-@@ -99,7 +99,7 @@ static PP_Property _props[] =
- 
- 	{ "field-color",           "dcdcdc",          true,  NULL, PP_LEVEL_FIELD},
- 	{ "field-font",	           "NULL",	          true,  NULL, PP_LEVEL_FIELD},
--	{ "font-family",           "Times New Roman", true,  NULL, PP_LEVEL_CHAR},
-+	{ "font-family",           "Liberation Serif", true,  NULL, PP_LEVEL_CHAR},
- 	{ "font-size",	           "12pt",	          true,  NULL, PP_LEVEL_CHAR},	// MS word defaults to 10pt, but it just seems too small
- 	{ "font-stretch",          "normal",          true,  NULL, PP_LEVEL_CHAR},
- 	{ "font-style",	           "normal",          true,  NULL, PP_LEVEL_CHAR},
-diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pp_Revision.cpp abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.cpp
---- abiword-2.8.6/src/text/ptbl/xp/pp_Revision.cpp	2009-05-07 23:35:14.000000000 -0300
-+++ abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.cpp	2011-07-02 15:37:08.881808814 -0300
-@@ -350,7 +350,7 @@ void PP_RevisionAttr::_init(const gchar
- 		return;
- 
- 	// the string we are parsing looks like
--	// "+1,-2,!3{font-family: Times New Roman}"
-+	// "+1,-2,!3{font-family: Liberation Serif}"
- 
- 	// first duplicate the string so we can play with it ...
- 	char * s = (char*) g_strdup(r);
-diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pp_Revision.h abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.h
---- abiword-2.8.6/src/text/ptbl/xp/pp_Revision.h	2009-01-04 20:32:46.000000000 -0200
-+++ abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.h	2011-07-02 15:37:09.530132814 -0300
-@@ -101,7 +101,7 @@ class ABI_EXPORT PP_Revision: public PP_
-       where n is a numerical id of the revision and props is regular
-       property string, for instance
- 
--          font-family:Times New Roman
-+          font-family:Liberation Serif
- 
-       revoval of property/attribute is indicated by setting to -/-, e.g.,
- 
-diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp abiword-libre-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp
---- abiword-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp	2009-01-04 18:34:28.000000000 -0200
-+++ abiword-libre-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp	2011-07-02 15:37:09.101918814 -0300
-@@ -155,7 +155,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v
- 		s += pCountry;
- 	}
- 	
--	const char* pszFamily = XAP_App::findNearestFont("Times New Roman",
-+	const char* pszFamily = XAP_App::findNearestFont("Liberation Serif",
- 													 "normal", "",
- 													 "normal", "", "12pt",
- 													 s.utf8_str());
-@@ -167,7 +167,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v
- 					  "text-indent:0in; text-position:normal; line-height:1.0; "
- 					  "color:000000; bgcolor:transparent; widows:2", pszFamily);
- 
--	pszFamily = XAP_App::findNearestFont("Arial", "normal", "",
-+	pszFamily = XAP_App::findNearestFont("Liberation Sans", "normal", "",
- 										 "normal", "", "12pt", s.utf8_str());
- 
- 	// used to set the dom-dir of the style here, but we do not want to do that. The
-@@ -239,7 +239,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v
- 	UT_String_sprintf(stTmp, list_fmt, "Heart List","0", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", "Dingbats", "NULL");
- 	_s("Heart List",false, "P", "", "Current Settings", stTmp.c_str());
- 
--	// pszFamily is the nearest font to Arial found in the system
-+	// pszFamily is the nearest font to Liberation Sans found in the system
- 	UT_String_sprintf(stTmp, "tabstops:0.3in/L0; list-style:Numbered List; "
- 					  "start-value:1; margin-left:0.0in; text-indent:0.0in; "
- 					  "field-color:transparent; list-delim:%%L.; field-font:%s; "
-@@ -250,7 +250,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v
-     _s("Numbered Heading 2",true,"P","Heading 2","Normal", stTmp.c_str());
-     _s("Numbered Heading 3",true,"P","Heading 3","Normal", stTmp.c_str());
- 
--	// pszFamily is the nearest font to Arial found in the system
-+	// pszFamily is the nearest font to Liberation Sans found in the system
- 
- 	UT_String_sprintf(stTmp, list_fmt, "Numbered List", "1",LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L.", "NULL", ".");
- 
-diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp
---- abiword-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp	2009-05-20 18:22:35.000000000 -0300
-+++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp	2011-07-02 15:37:01.798268815 -0300
-@@ -1170,7 +1170,7 @@ void AP_Lists_preview::setData(const gch
- 	//
- 	if(!pszFont || strcmp(pszFont,"NULL")== 0)
- 	{
--		m_pFont = m_gc->findFont("Times New Roman",
-+		m_pFont = m_gc->findFont("Liberation Serif",
- 								 "normal", "", "normal",
- 								 "", "16pt", NULL);
- 	}
-diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp
---- abiword-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp	2007-05-08 14:16:33.000000000 -0300
-+++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp	2011-07-02 15:37:02.462600815 -0300
-@@ -88,7 +88,7 @@ AP_Preview_PageNumbers::AP_Preview_PageN
- 	char fontString [10];
- 	sprintf(fontString, "%dpt", 8);
- 	
--	GR_Font * found =  m_gc->findFont("Times New Roman", "normal",
-+	GR_Font * found =  m_gc->findFont("Liberation Serif", "normal",
- 									  "", "normal", "", fontString,
- 									  NULL);
- 	
-diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp
---- abiword-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp	2009-09-29 10:58:11.000000000 -0300
-+++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp	2011-07-02 15:37:03.311024815 -0300
-@@ -94,7 +94,7 @@ void AP_Preview_Annotation::setSizeFromA
- 	pG = pView->getGraphics();
- 
- 	UT_return_if_fail(pG);
--	GR_Font * pFont = pG->findFont("Times New Roman", "normal",
-+	GR_Font * pFont = pG->findFont("Liberation Serif", "normal",
- 				       "normal", "normal",
- 				       "normal", "12pt",
- 				       NULL);
-@@ -122,7 +122,7 @@ void AP_Preview_Annotation::draw(void)
- 	UT_RGBColor FGcolor(0,0,0);
- 	UT_RGBColor BGcolor(m_clrBackground);
- 	
--	m_pFont = m_gc->findFont("Times New Roman", "normal",
-+	m_pFont = m_gc->findFont("Liberation Serif", "normal",
- 							 "normal", "normal",
- 							 "normal", "12pt",
- 							 NULL);
-diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp
---- abiword-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp	2009-03-09 17:01:46.000000000 -0200
-+++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp	2011-07-02 15:37:03.527132815 -0300
-@@ -539,7 +539,7 @@ void AP_Preview_Paragraph::draw(void)
- bool AP_Preview_Paragraph::_loadDrawFont(void)
- {
- 	// we draw at 7 points in this preview
--	GR_Font * font = m_gc->findFont("Times New Roman",
-+	GR_Font * font = m_gc->findFont("Liberation Serif",
- 									"normal", "", "normal",
- 									"", "7pt",
- 									NULL); // might need to get the real lang
-diff -auNpr abiword-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp abiword-libre-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp
---- abiword-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp	2009-09-29 17:00:48.000000000 -0300
-+++ abiword-libre-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp	2011-07-02 15:37:03.939338815 -0300
-@@ -2829,7 +2829,7 @@ void IE_Exp_RTF::_output_ListRTF(fl_Auto
- 	case DASHED_LIST:
- 		Param = 23;
- 		bulletsym = '-';
--		fontName = "Times New Roman";
-+		fontName = "Liberation Serif";
- 		break;
- 	case SQUARE_LIST:
- 		Param = 23;
-diff -auNpr abiword-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp
---- abiword-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp	2009-09-23 02:22:43.000000000 -0300
-+++ abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp	2011-07-02 15:37:03.883310815 -0300
-@@ -621,10 +621,10 @@ s_fieldFontForListStyle (MSWordListIdTyp
- 	  return "NULL";
- 
- 	case WLNF_UPPER_LETTER: // upper letter
--	  return "Times New Roman";
-+	  return "Liberation Serif";
- 
- 	case WLNF_LOWER_LETTER: // lower letter
--	  return "Times New Roman";
-+	  return "Liberation Serif";
- 
- 	case WLNF_BULLETS: // bullet list
- 		UT_DEBUGMSG(("Fieldfont set to symbol \n"));
-@@ -632,11 +632,11 @@ s_fieldFontForListStyle (MSWordListIdTyp
- 
- 	case WLNF_EUROPEAN_ARABIC:
- 	case WLNF_ORDINAL: // ordinal
--		return "Times New Roman";
-+		return "Liberation Serif";
- 		
- 	default:
--		UT_DEBUGMSG(("unknown list type %d field-font set to Times New Roman \n",id));
--	  return "Times New Roman";
-+		UT_DEBUGMSG(("unknown list type %d field-font set to Liberation Serif \n",id));
-+	  return "Liberation Serif";
- 	}
- }
- 
-@@ -5243,7 +5243,7 @@ void IE_Imp_MsWord_97::_generateCharProp
- 	if(fname)
- 		s += fname;
- 	else
--		s += "Times New Roman";
-+		s += "Liberation Serif";
- 	FREEP(fname);
- }
- 
-diff -auNpr abiword-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp
---- abiword-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp	2009-07-27 02:26:14.000000000 -0300
-+++ abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp	2011-07-02 15:37:04.239488815 -0300
-@@ -5958,11 +5958,11 @@ bool IE_Imp_RTF::buildCharacterProps(UT_
- 		// {\f83\fnil\fcharset0\fprq0{\*\panose 00000000000000000000} ;}
- 		// note the empty slot after the panose entry
- 		// later it gets referenced: {\b\f83\fs24\cf1\cgrid0 Malte Cornils
--		// this turns those into "Times New Roman" for now, as a hack to keep from crashing
-+		// this turns those into "Liberation Serif" for now, as a hack to keep from crashing
- 		if ( pFont->m_pFontName != NULL )
- 			propBuffer += pFont->m_pFontName;
- 		else
--			propBuffer += "Times New Roman";
-+			propBuffer += "Liberation Serif";
- 	}
- 	if (m_currentRTFState.m_charProps.m_hasColour)
- 	{
-@@ -8612,7 +8612,7 @@ bool IE_Imp_RTF::ReadFontTable()
- 	{
- 		// NB: Ignores whitespace until we've seen non-whitespace data.
- 		//     This means we pick up the spaces in font names like
--		//     "Times New Roman", but it also means that any font names
-+		//     "Liberation Serif", but it also means that any font names
- 		//     that genuinely start with spaces will have them discarded.
- 		//     This is hopefully not a problem.
- 		tokenType = NextToken(keyword, &parameter,& paramUsed,
-@@ -8680,11 +8680,11 @@ bool IE_Imp_RTF::ReadFontTable()
- 				// It's possible that the font name will be empty. This might happend 
- 				// because the font table didn't specify a name, or because the \ansicpgN
- 				// command was invalid, in which case the mbtowc convertion might fail.
--				// In these cases, substitute "Times New Roman".
-+				// In these cases, substitute "Liberation Serif".
- 				if (!sFontNamesAndPanose[SFontTableState::MainFontName].length())
- 				{
--					UT_DEBUGMSG(("RTF: Font Index %d: Substituting \"Times New Roman\" for missing font name.\n", fontIndex));
--					sFontNamesAndPanose[SFontTableState::MainFontName] = "Times New Roman";
-+					UT_DEBUGMSG(("RTF: Font Index %d: Substituting \"Liberation Serif\" for missing font name.\n", fontIndex));
-+					sFontNamesAndPanose[SFontTableState::MainFontName] = "Liberation Serif";
- 				}
- 				// Validate and post-process the Panose string.
- 				if (!PostProcessAndValidatePanose(sFontNamesAndPanose[SFontTableState::Panose])) 
-diff -auNpr abiword-2.8.6/user/wp/readme.abw abiword-libre-2.8.6/user/wp/readme.abw
---- abiword-2.8.6/user/wp/readme.abw	2009-07-23 16:50:13.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/readme.abw	2011-07-02 15:37:19.891310814 -0300
-@@ -16,9 +16,9 @@
- <version id="9" started="1131226323" uid="e94517c8-4e44-11da-9bf9-8faddbe5f409" auto="0" top-xid="120"/>
- </history>
- <styles>
--<s type="P" name="Heading 1" basedon="Normal" followedby="Normal" props="keep-with-next:1; margin-top:22pt; font-weight:bold; margin-bottom:3pt; font-family:Arial; font-size:17pt; lang:-none-"/>
--<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:0pt; font-style:normal; margin-left:0pt; lang:-none-; dom-dir:ltr; font-variant:normal; text-indent:0in; margin-bottom:12pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s type="P" name="Heading 2" basedon="Normal" followedby="Normal" props="keep-with-next:1; margin-top:22pt; font-weight:bold; margin-bottom:3pt; font-family:Arial; font-size:14pt; lang:-none-"/>
-+<s type="P" name="Heading 1" basedon="Normal" followedby="Normal" props="keep-with-next:1; margin-top:22pt; font-weight:bold; margin-bottom:3pt; font-family:Liberation Sans; font-size:17pt; lang:-none-"/>
-+<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:0pt; font-style:normal; margin-left:0pt; lang:-none-; dom-dir:ltr; font-variant:normal; text-indent:0in; margin-bottom:12pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s type="P" name="Heading 2" basedon="Normal" followedby="Normal" props="keep-with-next:1; margin-top:22pt; font-weight:bold; margin-bottom:3pt; font-family:Liberation Sans; font-size:14pt; lang:-none-"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section xid="1">
-diff -auNpr abiword-2.8.6/user/wp/templates/Business-Letter.awt abiword-libre-2.8.6/user/wp/templates/Business-Letter.awt
---- abiword-2.8.6/user/wp/templates/Business-Letter.awt	2009-05-22 07:15:16.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/Business-Letter.awt	2011-07-02 15:37:19.995362813 -0300
-@@ -19,14 +19,14 @@
- <version id="4" started="1097285263" uid="6ad98dfc-1992-11d9-90cf-d572573794e2" auto="0"/>
- </history>
- <styles>
--<s followedby="Return Address Section" name="Return Address Section" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:0pt; font-style:normal; margin-left:0.0000in; bgcolor:transparent; text-decoration:none; text-indent:0in; font-variant:normal; color:000000; lang:en-US; margin-right:0.0000in; margin-bottom:0pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s type="P" name="Normal" followedby="Current Settings" props="text-indent:0in; margin-top:0pt; margin-left:0pt; font-stretch:normal; line-height:1.0; text-align:left; bgcolor:transparent; lang:en-US; margin-bottom:0pt; font-weight:normal; text-decoration:none; font-variant:normal; color:000000; text-position:normal; font-size:12pt; margin-right:0pt; font-style:normal; widows:2; font-family:Times New Roman"/>
--<s followedby="Letter Body" name="Inside Address" basedon="Block Text" type="P" props="text-indent:0in; orphans:2; margin-top:0pt; margin-left:0.0000in; list-decimal:.; line-height:1.0; keep-with-next:no; text-align:left; list-style:None; bgcolor:transparent; lang:en-US; margin-bottom:0pt; font-weight:normal; text-decoration:none; start-value:1; font-variant:normal; color:000000; font-stretch:normal; keep-together:no; font-size:12pt; margin-right:0.0000in; font-style:normal; widows:2; list-delim:%L; font-family:Times New Roman"/>
-+<s followedby="Return Address Section" name="Return Address Section" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:0pt; font-style:normal; margin-left:0.0000in; bgcolor:transparent; text-decoration:none; text-indent:0in; font-variant:normal; color:000000; lang:en-US; margin-right:0.0000in; margin-bottom:0pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s type="P" name="Normal" followedby="Current Settings" props="text-indent:0in; margin-top:0pt; margin-left:0pt; font-stretch:normal; line-height:1.0; text-align:left; bgcolor:transparent; lang:en-US; margin-bottom:0pt; font-weight:normal; text-decoration:none; font-variant:normal; color:000000; text-position:normal; font-size:12pt; margin-right:0pt; font-style:normal; widows:2; font-family:Liberation Serif"/>
-+<s followedby="Letter Body" name="Inside Address" basedon="Block Text" type="P" props="text-indent:0in; orphans:2; margin-top:0pt; margin-left:0.0000in; list-decimal:.; line-height:1.0; keep-with-next:no; text-align:left; list-style:None; bgcolor:transparent; lang:en-US; margin-bottom:0pt; font-weight:normal; text-decoration:none; start-value:1; font-variant:normal; color:000000; font-stretch:normal; keep-together:no; font-size:12pt; margin-right:0.0000in; font-style:normal; widows:2; list-delim:%L; font-family:Liberation Serif"/>
- <s type="P" name="Block Text" basedon="Normal" followedby="Current Settings" props="margin-bottom:6pt; margin-right:1in; margin-left:1in"/>
--<s followedby="Letter Body" name="Letter Body" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:12pt; font-style:normal; margin-left:0pt; bgcolor:transparent; text-decoration:none; text-indent:0.0000in; font-variant:normal; color:000000; lang:en-US; margin-right:0pt; margin-bottom:0pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s followedby="Letter Body" name="Greeting" basedon="Normal" type="P" props="font-family:Times New Roman; margin-top:12pt; font-variant:normal; margin-left:0pt; text-align:left; font-style:normal; text-indent:0in; color:000000; line-height:1.0; widows:2; bgcolor:transparent; margin-right:0pt; text-decoration:none; font-size:12pt; font-weight:normal; margin-bottom:0pt; lang:en-US; font-stretch:normal"/>
--<s followedby="Signature Line" name="Closing" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:12pt; font-style:normal; margin-left:0.0000in; bgcolor:transparent; text-decoration:none; text-indent:0in; font-variant:normal; color:000000; lang:en-US; margin-right:0pt; margin-bottom:48pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s followedby="Block Text" name="Signature Line" basedon="Return Address Section" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:0pt; font-style:normal; margin-left:0.0000in; bgcolor:transparent; text-decoration:none; text-indent:0in; font-variant:normal; color:000000; lang:en-US; margin-right:0.0000in; margin-bottom:0pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Letter Body" name="Letter Body" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:12pt; font-style:normal; margin-left:0pt; bgcolor:transparent; text-decoration:none; text-indent:0.0000in; font-variant:normal; color:000000; lang:en-US; margin-right:0pt; margin-bottom:0pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Letter Body" name="Greeting" basedon="Normal" type="P" props="font-family:Liberation Serif; margin-top:12pt; font-variant:normal; margin-left:0pt; text-align:left; font-style:normal; text-indent:0in; color:000000; line-height:1.0; widows:2; bgcolor:transparent; margin-right:0pt; text-decoration:none; font-size:12pt; font-weight:normal; margin-bottom:0pt; lang:en-US; font-stretch:normal"/>
-+<s followedby="Signature Line" name="Closing" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:12pt; font-style:normal; margin-left:0.0000in; bgcolor:transparent; text-decoration:none; text-indent:0in; font-variant:normal; color:000000; lang:en-US; margin-right:0pt; margin-bottom:48pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Block Text" name="Signature Line" basedon="Return Address Section" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:0pt; font-style:normal; margin-left:0.0000in; bgcolor:transparent; text-decoration:none; text-indent:0in; font-variant:normal; color:000000; lang:en-US; margin-right:0.0000in; margin-bottom:0pt; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
- <section props="page-margin-footer:0.5in; page-margin-header:0.5in">
-diff -auNpr abiword-2.8.6/user/wp/templates/Business-Report.awt abiword-libre-2.8.6/user/wp/templates/Business-Report.awt
---- abiword-2.8.6/user/wp/templates/Business-Report.awt	2009-05-22 07:15:18.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/Business-Report.awt	2011-07-02 15:37:20.011370813 -0300
-@@ -21,7 +21,7 @@
- <p style="Normal" props="text-align:right"><c props="lang:en-US; font-size:12 pt"></c></p>
- <p style="Normal" props="text-align:right"><c props="lang:en-US; font-size:12 pt"></c></p>
- <p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:48 pt; font-weight:bold">Title</c><c props="lang:en-US; font-size:48 pt; font-weight:bold"></c></p>
--<p style="Normal" props="text-align:left"><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:en-US; text-position:normal; font-weight:bold; font-style:normal; font-size:48pt">Subtitle</c><c props="font-family:Times New Roman; text-decoration:none; color:000000; lang:en-US; text-position:normal; font-weight:bold; font-style:normal; font-size:48pt"></c></p>
-+<p style="Normal" props="text-align:left"><c props="font-family:Liberation Serif; text-decoration:none; color:000000; lang:en-US; text-position:normal; font-weight:bold; font-style:normal; font-size:48pt">Subtitle</c><c props="font-family:Liberation Serif; text-decoration:none; color:000000; lang:en-US; text-position:normal; font-weight:bold; font-style:normal; font-size:48pt"></c></p>
- <p style="Normal" props="text-align:right; margin-top:0pt; line-height:1.0"><c props="lang:en-US; font-size:8 pt"></c><image dataid="/home/dickk/images/balk.png_0" props="lang:en-US; height:0.090551in; width:6.295276in"/></p>
- <p style="Normal" props="text-align:right; margin-top:0pt; line-height:1.0"><c props="lang:en-US; font-size:18 pt; font-weight:bold">Release 1.0</c></p>
- <p style="Normal"><c props="lang:en-US"></c></p>
-@@ -99,11 +99,11 @@
- <section footer="1961180032" header="671410933">
- <p style="Normal"></p>
- <p style="Normal"></p>
--<p level="1" listid="1908846824" parentid="0" style="Numbered Heading 1" props="start-value:1; text-indent:0.0000in; list-style:Numbered List; field-font:Arial; margin-left:0.0000in"><c props="list-tag:254800672"><pbr/></c><c props="list-tag:254800672"></c><field type="list_label" props="width:0in; font-family:Arial; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:17pt"></field><c type="list_label" props="width:0in; font-family:Arial; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:17pt">	Heading 1</c></p>
-+<p level="1" listid="1908846824" parentid="0" style="Numbered Heading 1" props="start-value:1; text-indent:0.0000in; list-style:Numbered List; field-font:Liberation Sans; margin-left:0.0000in"><c props="list-tag:254800672"><pbr/></c><c props="list-tag:254800672"></c><field type="list_label" props="width:0in; font-family:Liberation Sans; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:17pt"></field><c type="list_label" props="width:0in; font-family:Liberation Sans; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:17pt">	Heading 1</c></p>
- <p style="Normal"><c type="list_label" props="lang:en-US; height:0in; width:0in">text</c><c type="list_label" props="lang:en-US; height:0in; width:0in"></c></p>
--<p level="2" listid="686698307" parentid="1908846824" style="Numbered Heading 2" props="start-value:1; text-indent:0.0000in; list-style:Numbered List; field-font:Arial; margin-left:0.0000in"><c type="list_label" props="lang:en-US; height:0in; width:0in; list-tag:1877104478"></c><field type="list_label" props="width:0in; font-family:Arial; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:14pt"></field><c type="list_label" props="width:0in; font-family:Arial; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:14pt">	Heading 2</c></p>
-+<p level="2" listid="686698307" parentid="1908846824" style="Numbered Heading 2" props="start-value:1; text-indent:0.0000in; list-style:Numbered List; field-font:Liberation Sans; margin-left:0.0000in"><c type="list_label" props="lang:en-US; height:0in; width:0in; list-tag:1877104478"></c><field type="list_label" props="width:0in; font-family:Liberation Sans; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:14pt"></field><c type="list_label" props="width:0in; font-family:Liberation Sans; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:14pt">	Heading 2</c></p>
- <p style="Normal"><c type="list_label" props="lang:en-US; height:0in; width:0in">text</c><c type="list_label" props="lang:en-US; height:0in; width:0in"></c></p>
--<p level="3" listid="1990149216" parentid="686698307" style="Numbered Heading 3" props="start-value:1; text-indent:0.0000in; list-style:Numbered List; field-font:Arial; margin-left:0.0000in"><c type="list_label" props="lang:en-US; height:0in; width:0in; list-tag:1324672020"></c><field type="list_label" props="width:0in; font-family:Arial; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:12pt"></field><c type="list_label" props="width:0in; font-family:Arial; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:12pt">	Heading 3</c></p>
-+<p level="3" listid="1990149216" parentid="686698307" style="Numbered Heading 3" props="start-value:1; text-indent:0.0000in; list-style:Numbered List; field-font:Liberation Sans; margin-left:0.0000in"><c type="list_label" props="lang:en-US; height:0in; width:0in; list-tag:1324672020"></c><field type="list_label" props="width:0in; font-family:Liberation Sans; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:12pt"></field><c type="list_label" props="width:0in; font-family:Liberation Sans; color:000000; font-weight:bold; lang:en-US; font-style:normal; text-position:normal; bgcolor:transparent; text-decoration:none; height:0in; font-size:12pt">	Heading 3</c></p>
- <p style="Normal"><c type="list_label" props="lang:en-US; height:0in; width:0in"></c></p>
- </section>
- <section id="1961180032" listid="0" parentid="0" type="footer">
-diff -auNpr abiword-2.8.6/user/wp/templates/Employee-Directory.awt abiword-libre-2.8.6/user/wp/templates/Employee-Directory.awt
---- abiword-2.8.6/user/wp/templates/Employee-Directory.awt	2009-05-22 07:15:21.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/Employee-Directory.awt	2011-07-02 15:37:20.047388813 -0300
-@@ -10,9 +10,9 @@
- 
- <pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
- <section props="page-margin-footer:0.5in; page-margin-header:0.5in">
--<p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:20pt; font-family:Times New Roman">Company Name</c></p>
--<p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:26pt; font-family:Times New Roman">Directory of Employees</c></p>
--<p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:12pt; font-family:Times New Roman"></c><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_0" props="height:0.15in; font-size:12pt; width:8.23in"/></p>
-+<p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:20pt; font-family:Liberation Serif">Company Name</c></p>
-+<p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:26pt; font-family:Liberation Serif">Directory of Employees</c></p>
-+<p style="Normal" props="text-align:left"><c props="lang:en-US; font-size:12pt; font-family:Liberation Serif"></c><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_0" props="height:0.15in; font-size:12pt; width:8.23in"/></p>
- <p style="Normal" props="text-align:center"><c props="lang:en-US; font-size:12pt"></c></p>
- <p style="Normal" props="text-align:center"><c props="lang:en-US; font-size:12pt"></c></p>
- <p style="Normal" props="text-align:center"><c props="lang:en-US"></c></p>
-@@ -36,59 +36,59 @@
- <p style="Normal" props="tabstops:2.0000in/L0"><c type="date">Normal Style	(123) 555-1212</c></p>
- <p style="Normal" props="text-align:left; tabstops:2.0000in/L0"><c type="date" props="font-weight:normal; font-size:11pt; font-style:normal"></c></p>
- <p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-weight:normal; font-size:11pt; font-style:normal"></c></p>
--<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Arial; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; lang:en-US; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none"></c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
--<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Arial; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
--<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Arial; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
--<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Arial; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
--<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Arial; font-size:12pt; color:000000; lang:en-US; text-position:normal; font-weight:bold; font-style:normal; text-decoration:underline ">General Numbers</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Front Desk	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Security	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Building Management	(123) 555-1212</c></p>
--<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Times New Roman; font-size:12pt; color:000000; lang:en-US; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none">Other General Numbers	(123) 555-1212</c></p>
-+<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Liberation Sans; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; lang:en-US; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none"></c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
-+<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Liberation Sans; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
-+<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Liberation Sans; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
-+<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Liberation Sans; font-size:12pt; color:000000; text-decoration:underline ; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">Department Name</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:bold; font-style:normal; lang:en-US">The big boss upstairs	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Last Name, First Name	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US"></c></p>
-+<p style="Heading 3" props="margin-top:0.3056in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0417in; text-indent:0.0000in; line-height:1.000000; text-align:center; margin-right:0.0000in"><c type="date" props="font-family:Liberation Sans; font-size:12pt; color:000000; lang:en-US; text-position:normal; font-weight:bold; font-style:normal; text-decoration:underline ">General Numbers</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Front Desk	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Security	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">Building Management	(123) 555-1212</c></p>
-+<p style="Normal" props="margin-top:0.0000in; margin-left:0.0000in; tabstops:2.000000in/L0; margin-bottom:0.0000in; text-indent:0.0000in; line-height:1.000000; text-align:left; margin-right:0.0000in"><c type="date" props="font-family:Liberation Serif; font-size:12pt; color:000000; lang:en-US; text-position:normal; font-weight:normal; font-style:normal; text-decoration:none">Other General Numbers	(123) 555-1212</c></p>
- </section>
- <data>
- <d name="C:\Documents and Settings\jgz\Desktop\bookopen.bmp_0" mime-type="image/png" base64="yes">
-diff -auNpr abiword-2.8.6/user/wp/templates/Fax-Coversheet.awt abiword-libre-2.8.6/user/wp/templates/Fax-Coversheet.awt
---- abiword-2.8.6/user/wp/templates/Fax-Coversheet.awt	2009-05-22 07:15:24.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/Fax-Coversheet.awt	2011-07-02 15:37:20.027378813 -0300
-@@ -10,26 +10,26 @@
- 
- <pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
- <section props="page-margin-footer:0.5in; page-margin-header:0.5in">
--<p style="Normal" props="tabstops:6.2500in/R0,2.7500in/L0,4.5000in/C0"><c props="lang:en-US">	</c><c props="bgcolor:000000; lang:en-US; font-size:24pt; font-family:Arial Black; color:ffffff">	Company Name	</c><c props="bgcolor:000000; lang:en-US; font-size:12pt; font-family:Arial Black; color:ffffff"></c></p>
--<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000">Company Address Line 1</c></p>
--<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000">Company Address Line 2</c></p>
--<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000">Company Address Line 3</c></p>
--<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000"></c></p>
--<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:72pt; font-family:Arial Black; color:000000">FAX</c></p>
--<p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0"><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">TO:	</c><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000">	</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">From:	</c></p>
--<p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0"><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_0" props="height:0.15in; width:8.23in"/><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">Fax:	</c><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000">	</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">Pages:	</c></p>
--<p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0"><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_1" props="height:0.15in; width:8.23in"/><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">Phone:	</c><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Arial; color:000000">	</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">Date:	</c><field type="date_mdy" param=""></field></p>
-+<p style="Normal" props="tabstops:6.2500in/R0,2.7500in/L0,4.5000in/C0"><c props="lang:en-US">	</c><c props="bgcolor:000000; lang:en-US; font-size:24pt; font-family:Liberation Sans Black; color:ffffff">	Company Name	</c><c props="bgcolor:000000; lang:en-US; font-size:12pt; font-family:Liberation Sans Black; color:ffffff"></c></p>
-+<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000">Company Address Line 1</c></p>
-+<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000">Company Address Line 2</c></p>
-+<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000">Company Address Line 3</c></p>
-+<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000"></c></p>
-+<p style="Normal"><c props="bgcolor:ffffff; lang:en-US; font-size:72pt; font-family:Liberation Sans Black; color:000000">FAX</c></p>
-+<p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0"><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">TO:	</c><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000">	</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">From:	</c></p>
-+<p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0"><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_0" props="height:0.15in; width:8.23in"/><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">Fax:	</c><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000">	</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">Pages:	</c></p>
-+<p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0"><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_1" props="height:0.15in; width:8.23in"/><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">Phone:	</c><c props="bgcolor:ffffff; lang:en-US; font-size:12pt; font-family:Liberation Sans; color:000000">	</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">Date:	</c><field type="date_mdy" param=""></field></p>
- <p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0; margin-left:0.0000in"><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_2" props="height:0.15in; width:8.23in"/></p>
- <p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0; margin-left:0.0000in"><c type="date_mdy" param="" props="font-weight:bold">Re:	</c><c type="date_mdy" param="">	</c><c type="date_mdy" param="" props="font-weight:bold">CC:		</c></p>
- <p style="Normal" props="tabstops:4.0000in/L0,0.7500in/L0,3.2500in/L0; margin-left:0.0000in"><c type="date_mdy" param="" props="font-weight:bold"></c><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_4" props="height:0.15in; width:8.23in"/></p>
- <p style="Normal" props="tabstops:2.2500in/L0,1.0000in/L0,3.7500in/L0,5.0000in/L0; margin-left:0.0000in"></p>
--<p style="Normal" props="tabstops:2.2500in/L0,1.0000in/L0,3.7500in/L0,5.0000in/L0; margin-left:0.0000in"><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Times New Roman; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Urgent	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">For Review	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Times New Roman; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Please Comment	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Times New Roman; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Please Reply	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Times New Roman; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Please Recycle</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt">	</c></p>
--<p style="Normal" props="tabstops:2.2500in/L0,1.0000in/L0,3.7500in/L0,5.0000in/L0; margin-left:0.0000in"><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Arial; font-size:12pt"></c><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_5" props="height:0.15in; width:8.23in"/></p>
-+<p style="Normal" props="tabstops:2.2500in/L0,1.0000in/L0,3.7500in/L0,5.0000in/L0; margin-left:0.0000in"><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Liberation Serif; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Urgent	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">For Review	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Liberation Serif; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Please Comment	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Liberation Serif; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Please Reply	</c><c type="date_mdy" param="" props="font-family:Symbol; font-weight:bold"></c><c type="date_mdy" param="" props="font-family:Liberation Serif; font-weight:bold"> </c><c type="date_mdy" param="" props="font-weight:bold">Please Recycle</c><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt">	</c></p>
-+<p style="Normal" props="tabstops:2.2500in/L0,1.0000in/L0,3.7500in/L0,5.0000in/L0; margin-left:0.0000in"><c props="bgcolor:ffffff; lang:en-US; font-weight:bold; color:000000; font-family:Liberation Sans; font-size:12pt"></c><image dataid="C:\Documents and Settings\jgz\Desktop\bar.bmp_5" props="height:0.15in; width:8.23in"/></p>
- <p style="Normal"></p>
- <p style="Normal"></p>
--<p style="Normal" props="text-align:center"><c props="font-family:Arial; text-decoration:underline; color:000000; lang:en-US; bgcolor:ffffff; font-weight:bold; font-size:16pt">Comments</c></p>
-+<p style="Normal" props="text-align:center"><c props="font-family:Liberation Sans; text-decoration:underline; color:000000; lang:en-US; bgcolor:ffffff; font-weight:bold; font-size:16pt">Comments</c></p>
- <p style="Normal" props="margin-left:0.0000in"></p>
--<p style="Normal" props="margin-left:0.0000in"><c props="font-family:Arial; color:000000; font-size:10pt; text-position:normal; lang:en-US; bgcolor:ffffff; font-weight:normal; font-style:normal; text-decoration:none">This text should the replaced with your comments about the fax and any </c><c props="font-family:Arial; bgcolor:ffffff; font-size:10pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">additional</c><c props="font-family:Arial; color:000000; font-size:10pt; text-position:normal; lang:en-US; bgcolor:ffffff; font-weight:normal; font-style:normal; text-decoration:none"> comment to the receiver. </c></p>
-+<p style="Normal" props="margin-left:0.0000in"><c props="font-family:Liberation Sans; color:000000; font-size:10pt; text-position:normal; lang:en-US; bgcolor:ffffff; font-weight:normal; font-style:normal; text-decoration:none">This text should the replaced with your comments about the fax and any </c><c props="font-family:Liberation Sans; bgcolor:ffffff; font-size:10pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">additional</c><c props="font-family:Liberation Sans; color:000000; font-size:10pt; text-position:normal; lang:en-US; bgcolor:ffffff; font-weight:normal; font-style:normal; text-decoration:none"> comment to the receiver. </c></p>
- </section>
- <data>
- <d name="C:\Documents and Settings\jgz\Desktop\bar.bmp_0" mime-type="image/png" base64="yes">
-diff -auNpr abiword-2.8.6/user/wp/templates/Friendly-Letter.awt abiword-libre-2.8.6/user/wp/templates/Friendly-Letter.awt
---- abiword-2.8.6/user/wp/templates/Friendly-Letter.awt	2009-05-22 07:15:27.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/Friendly-Letter.awt	2011-07-02 15:37:20.023376813 -0300
-@@ -16,12 +16,12 @@
- <version id="1" started="1096736888" uid="a22a447e-1495-11d9-9525-9e1170ef822d" auto="0"/>
- </history>
- <styles>
--<s followedby="Return Address Section" name="Return Address Section" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:0pt; font-style:normal; margin-left:4.5000in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.0000in; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s type="P" name="Normal" followedby="Current Settings" props="text-indent:0in; margin-top:0pt; margin-left:0pt; font-stretch:normal; line-height:1.0; text-align:left; bgcolor:transparent; lang:en-US; margin-bottom:0pt; text-decoration:none; font-weight:normal; font-variant:normal; color:000000; text-position:normal; font-size:12pt; margin-right:0pt; font-style:normal; widows:2; font-family:Times New Roman"/>
--<s followedby="Letter Body" name="Greeting" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:12pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s followedby="Letter Body" name="Letter Body" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:12pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0.5000in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s followedby="Signature Line" name="Closing" basedon="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:12pt; font-style:normal; margin-left:4.5000in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:48pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s type="P" name="Signature Line" basedon="Return Address Section" followedby="Block Text" props="font-weight:normal; font-family:Times New Roman; margin-top:0pt; font-style:normal; margin-left:4.5000in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.0000in; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Return Address Section" name="Return Address Section" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:0pt; font-style:normal; margin-left:4.5000in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.0000in; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s type="P" name="Normal" followedby="Current Settings" props="text-indent:0in; margin-top:0pt; margin-left:0pt; font-stretch:normal; line-height:1.0; text-align:left; bgcolor:transparent; lang:en-US; margin-bottom:0pt; text-decoration:none; font-weight:normal; font-variant:normal; color:000000; text-position:normal; font-size:12pt; margin-right:0pt; font-style:normal; widows:2; font-family:Liberation Serif"/>
-+<s followedby="Letter Body" name="Greeting" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:12pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Letter Body" name="Letter Body" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:12pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0.5000in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Signature Line" name="Closing" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:12pt; font-style:normal; margin-left:4.5000in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:48pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s type="P" name="Signature Line" basedon="Return Address Section" followedby="Block Text" props="font-weight:normal; font-family:Liberation Serif; margin-top:0pt; font-style:normal; margin-left:4.5000in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.0000in; color:000000; font-size:12pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
- <section props="page-margin-footer:0.5in; page-margin-header:0.5in">
-diff -auNpr abiword-2.8.6/user/wp/templates/Memo.awt abiword-libre-2.8.6/user/wp/templates/Memo.awt
---- abiword-2.8.6/user/wp/templates/Memo.awt	2009-05-22 07:15:31.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/Memo.awt	2011-07-02 15:37:19.915322814 -0300
-@@ -14,10 +14,10 @@
- <m key="abiword.date_last_changed">Fri Mar 12 21:07:56 2004</m>
- </metadata>
- <styles>
--<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Times New Roman; margin-top:0pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:10pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:10pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s followedby="Normal" name="Heading 3" basedon="Normal" type="P" props="font-weight:normal; margin-top:22pt; keep-with-next:1; margin-bottom:3pt; font-family:Arial; font-size:10pt"/>
--<s followedby="Normal" name="Heading 2" basedon="Normal" type="P" props="margin-top:22pt; font-size:10pt; margin-bottom:3pt; text-align:right; font-style:italic; font-weight:normal; font-family:Arial; keep-with-next:1"/>
--<s type="P" name="Heading 1" basedon="Normal" followedby="Normal" props="keep-with-next:1; margin-top:22pt; font-weight:bold; margin-bottom:3pt; font-family:Arial; font-size:17pt"/>
-+<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Liberation Serif; margin-top:0pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:10pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:10pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Normal" name="Heading 3" basedon="Normal" type="P" props="font-weight:normal; margin-top:22pt; keep-with-next:1; margin-bottom:3pt; font-family:Liberation Sans; font-size:10pt"/>
-+<s followedby="Normal" name="Heading 2" basedon="Normal" type="P" props="margin-top:22pt; font-size:10pt; margin-bottom:3pt; text-align:right; font-style:italic; font-weight:normal; font-family:Liberation Sans; keep-with-next:1"/>
-+<s type="P" name="Heading 1" basedon="Normal" followedby="Normal" props="keep-with-next:1; margin-top:22pt; font-weight:bold; margin-bottom:3pt; font-family:Liberation Sans; font-size:17pt"/>
- </styles>
- <lists>
- <l id="1002" parentid="0" type="5" start-value="0" list-delim="%L" list-decimal="NULL"/>
-@@ -59,10 +59,10 @@
- <p style="Normal">The box that this text is in uses AbiWord's table support to draw the border.  You can either allow the border to fit to the size of the text as it is now, or press &lt;ENTER&gt; repeatedly at the end of your memo to expand the border to fill the rest of the page.</p>
- <p style="Normal">Don't forget to change the header and footer before printing!  If you wish to save this memo for later and ensure that the date above is saved as today's (not automatically updating), select it and type the desired date text over it.</p>
- <p style="Normal">The styles used in this document for correct conversion, import, export, and HTML are:</p>
--<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="list-tag:1003"></c><field type="list_label" props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Heading 1 for Company Name</c></p>
--<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="width:0in; list-tag:1004; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; lang:en-US; font-variant:normal; color:000000; list-style:Bullet List; bgcolor:transparent; font-size:10pt; homogeneous:1; text-decoration:none; height:0in; text-position:normal; font-stretch:normal"></c><field type="list_label" props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Heading 2 for Slogan</c></p>
--<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="width:0in; list-tag:1005; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; lang:en-US; font-variant:normal; color:000000; list-style:Bullet List; bgcolor:transparent; font-size:10pt; homogeneous:1; text-decoration:none; height:0in; text-position:normal; font-stretch:normal"></c><field type="list_label" props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Heading 3 for "Date:", "To:", etc.</c></p>
--<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="width:0in; list-tag:1006; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; lang:en-US; font-variant:normal; color:000000; list-style:Bullet List; bgcolor:transparent; font-size:10pt; homogeneous:1; text-decoration:none; height:0in; text-position:normal; font-stretch:normal"></c><field type="list_label" props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Times New Roman; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Normal for body text</c></p>
-+<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="list-tag:1003"></c><field type="list_label" props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Heading 1 for Company Name</c></p>
-+<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="width:0in; list-tag:1004; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; lang:en-US; font-variant:normal; color:000000; list-style:Bullet List; bgcolor:transparent; font-size:10pt; homogeneous:1; text-decoration:none; height:0in; text-position:normal; font-stretch:normal"></c><field type="list_label" props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Heading 2 for Slogan</c></p>
-+<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="width:0in; list-tag:1005; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; lang:en-US; font-variant:normal; color:000000; list-style:Bullet List; bgcolor:transparent; font-size:10pt; homogeneous:1; text-decoration:none; height:0in; text-position:normal; font-stretch:normal"></c><field type="list_label" props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Heading 3 for "Date:", "To:", etc.</c></p>
-+<p level="1" listid="1002" parentid="0" style="Normal" props="start-value:0; text-indent:-0.3000in; list-style:Bullet List; field-font:Symbol; margin-left:0.5000in"><c props="width:0in; list-tag:1006; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; lang:en-US; font-variant:normal; color:000000; list-style:Bullet List; bgcolor:transparent; font-size:10pt; homogeneous:1; text-decoration:none; height:0in; text-position:normal; font-stretch:normal"></c><field type="list_label" props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal"></field><c props="width:0in; font-family:Liberation Serif; display:inline; font-style:normal; font-weight:normal; bgcolor:transparent; lang:en-US; text-position:normal; homogeneous:1; color:000000; font-variant:normal; text-decoration:none; font-size:10pt; height:0in; list-style:Bullet List; font-stretch:normal">	Normal for body text</c></p>
- </cell>
- </table>
- <p style="Normal"></p>
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt abiword-libre-2.8.6/user/wp/templates/normal.awt
---- abiword-2.8.6/user/wp/templates/normal.awt	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt	2011-07-02 15:37:20.019374813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- 
- <pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-am_ET abiword-libre-2.8.6/user/wp/templates/normal.awt-am_ET
---- abiword-2.8.6/user/wp/templates/normal.awt-am_ET	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-am_ET	2011-07-02 15:37:20.015372813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ar abiword-libre-2.8.6/user/wp/templates/normal.awt-ar
---- abiword-2.8.6/user/wp/templates/normal.awt-ar	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ar	2011-07-02 15:37:20.019374813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ar_EG abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_EG
---- abiword-2.8.6/user/wp/templates/normal.awt-ar_EG	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_EG	2011-07-02 15:37:19.979354813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ar_SA abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_SA
---- abiword-2.8.6/user/wp/templates/normal.awt-ar_SA	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_SA	2011-07-02 15:37:19.999364813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-bg_BG abiword-libre-2.8.6/user/wp/templates/normal.awt-bg_BG
---- abiword-2.8.6/user/wp/templates/normal.awt-bg_BG	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-bg_BG	2011-07-02 15:37:19.975352813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ca_ES abiword-libre-2.8.6/user/wp/templates/normal.awt-ca_ES
---- abiword-2.8.6/user/wp/templates/normal.awt-ca_ES	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ca_ES	2011-07-02 15:37:19.923326814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-cs_CZ abiword-libre-2.8.6/user/wp/templates/normal.awt-cs_CZ
---- abiword-2.8.6/user/wp/templates/normal.awt-cs_CZ	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-cs_CZ	2011-07-02 15:37:20.003366813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-da_DK abiword-libre-2.8.6/user/wp/templates/normal.awt-da_DK
---- abiword-2.8.6/user/wp/templates/normal.awt-da_DK	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-da_DK	2011-07-02 15:37:19.995362813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de abiword-libre-2.8.6/user/wp/templates/normal.awt-de
---- abiword-2.8.6/user/wp/templates/normal.awt-de	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de	2011-07-02 15:37:20.007368813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de_AT abiword-libre-2.8.6/user/wp/templates/normal.awt-de_AT
---- abiword-2.8.6/user/wp/templates/normal.awt-de_AT	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de_AT	2011-07-02 15:37:19.975352813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de_CH abiword-libre-2.8.6/user/wp/templates/normal.awt-de_CH
---- abiword-2.8.6/user/wp/templates/normal.awt-de_CH	2008-04-09 21:48:42.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de_CH	2011-07-02 15:37:19.979354813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de_DE abiword-libre-2.8.6/user/wp/templates/normal.awt-de_DE
---- abiword-2.8.6/user/wp/templates/normal.awt-de_DE	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de_DE	2011-07-02 15:37:20.035382813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-div_MV abiword-libre-2.8.6/user/wp/templates/normal.awt-div_MV
---- abiword-2.8.6/user/wp/templates/normal.awt-div_MV	2007-01-14 12:52:46.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-div_MV	2011-07-02 15:37:20.071400813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:div-MV; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:div-MV; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-el_GR abiword-libre-2.8.6/user/wp/templates/normal.awt-el_GR
---- abiword-2.8.6/user/wp/templates/normal.awt-el_GR	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-el_GR	2011-07-02 15:37:20.063396813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_AU abiword-libre-2.8.6/user/wp/templates/normal.awt-en_AU
---- abiword-2.8.6/user/wp/templates/normal.awt-en_AU	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_AU	2011-07-02 15:37:19.903316814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_CA abiword-libre-2.8.6/user/wp/templates/normal.awt-en_CA
---- abiword-2.8.6/user/wp/templates/normal.awt-en_CA	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_CA	2011-07-02 15:37:20.079404813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="Letter" orientation="portrait" width="216.000000" height="279.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_GB abiword-libre-2.8.6/user/wp/templates/normal.awt-en_GB
---- abiword-2.8.6/user/wp/templates/normal.awt-en_GB	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_GB	2011-07-02 15:37:19.911320814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_IE abiword-libre-2.8.6/user/wp/templates/normal.awt-en_IE
---- abiword-2.8.6/user/wp/templates/normal.awt-en_IE	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_IE	2011-07-02 15:37:20.075402813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_NZ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_NZ
---- abiword-2.8.6/user/wp/templates/normal.awt-en_NZ	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_NZ	2011-07-02 15:37:20.067398813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_ZA abiword-libre-2.8.6/user/wp/templates/normal.awt-en_ZA
---- abiword-2.8.6/user/wp/templates/normal.awt-en_ZA	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_ZA	2011-07-02 15:37:20.079404813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es abiword-libre-2.8.6/user/wp/templates/normal.awt-es
---- abiword-2.8.6/user/wp/templates/normal.awt-es	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es	2011-07-02 15:37:19.903316814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_AR abiword-libre-2.8.6/user/wp/templates/normal.awt-es_AR
---- abiword-2.8.6/user/wp/templates/normal.awt-es_AR	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_AR	2011-07-02 15:37:20.039384813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_ES abiword-libre-2.8.6/user/wp/templates/normal.awt-es_ES
---- abiword-2.8.6/user/wp/templates/normal.awt-es_ES	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_ES	2011-07-02 15:37:20.063396813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_IR abiword-libre-2.8.6/user/wp/templates/normal.awt-es_IR
---- abiword-2.8.6/user/wp/templates/normal.awt-es_IR	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_IR	2011-07-02 15:37:20.011370813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_MX abiword-libre-2.8.6/user/wp/templates/normal.awt-es_MX
---- abiword-2.8.6/user/wp/templates/normal.awt-es_MX	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_MX	2011-07-02 15:37:19.919324814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fa_IR abiword-libre-2.8.6/user/wp/templates/normal.awt-fa_IR
---- abiword-2.8.6/user/wp/templates/normal.awt-fa_IR	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fa_IR	2011-07-02 15:37:20.003366813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fi_FI abiword-libre-2.8.6/user/wp/templates/normal.awt-fi_FI
---- abiword-2.8.6/user/wp/templates/normal.awt-fi_FI	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fi_FI	2011-07-02 15:37:19.999364813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr abiword-libre-2.8.6/user/wp/templates/normal.awt-fr
---- abiword-2.8.6/user/wp/templates/normal.awt-fr	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr	2011-07-02 15:37:20.019374813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_BE abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_BE
---- abiword-2.8.6/user/wp/templates/normal.awt-fr_BE	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_BE	2011-07-02 15:37:20.075402813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_CA abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CA
---- abiword-2.8.6/user/wp/templates/normal.awt-fr_CA	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CA	2011-07-02 15:37:19.907318814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="Letter" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_CH abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CH
---- abiword-2.8.6/user/wp/templates/normal.awt-fr_CH	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CH	2011-07-02 15:37:19.899314814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_FR abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_FR
---- abiword-2.8.6/user/wp/templates/normal.awt-fr_FR	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_FR	2011-07-02 15:37:19.983356813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-gl_ES abiword-libre-2.8.6/user/wp/templates/normal.awt-gl_ES
---- abiword-2.8.6/user/wp/templates/normal.awt-gl_ES	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-gl_ES	2011-07-02 15:37:20.023376813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-he abiword-libre-2.8.6/user/wp/templates/normal.awt-he
---- abiword-2.8.6/user/wp/templates/normal.awt-he	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-he	2011-07-02 15:37:19.995362813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-he_IL abiword-libre-2.8.6/user/wp/templates/normal.awt-he_IL
---- abiword-2.8.6/user/wp/templates/normal.awt-he_IL	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-he_IL	2011-07-02 15:37:19.979354813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-hu_HU abiword-libre-2.8.6/user/wp/templates/normal.awt-hu_HU
---- abiword-2.8.6/user/wp/templates/normal.awt-hu_HU	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-hu_HU	2011-07-02 15:37:19.979354813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-it_IT abiword-libre-2.8.6/user/wp/templates/normal.awt-it_IT
---- abiword-2.8.6/user/wp/templates/normal.awt-it_IT	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-it_IT	2011-07-02 15:37:19.911320814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ja_JP abiword-libre-2.8.6/user/wp/templates/normal.awt-ja_JP
---- abiword-2.8.6/user/wp/templates/normal.awt-ja_JP	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ja_JP	2011-07-02 15:37:20.027378813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-lt_LT abiword-libre-2.8.6/user/wp/templates/normal.awt-lt_LT
---- abiword-2.8.6/user/wp/templates/normal.awt-lt_LT	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-lt_LT	2011-07-02 15:37:19.899314814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-nb_NO abiword-libre-2.8.6/user/wp/templates/normal.awt-nb_NO
---- abiword-2.8.6/user/wp/templates/normal.awt-nb_NO	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-nb_NO	2011-07-02 15:37:19.999364813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-nl_NL abiword-libre-2.8.6/user/wp/templates/normal.awt-nl_NL
---- abiword-2.8.6/user/wp/templates/normal.awt-nl_NL	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-nl_NL	2011-07-02 15:37:19.911320814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-nn_NO abiword-libre-2.8.6/user/wp/templates/normal.awt-nn_NO
---- abiword-2.8.6/user/wp/templates/normal.awt-nn_NO	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-nn_NO	2011-07-02 15:37:20.031380813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-pl_PL abiword-libre-2.8.6/user/wp/templates/normal.awt-pl_PL
---- abiword-2.8.6/user/wp/templates/normal.awt-pl_PL	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-pl_PL	2011-07-02 15:37:20.011370813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ps abiword-libre-2.8.6/user/wp/templates/normal.awt-ps
---- abiword-2.8.6/user/wp/templates/normal.awt-ps	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ps	2011-07-02 15:37:20.035382813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-pt_BR abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_BR
---- abiword-2.8.6/user/wp/templates/normal.awt-pt_BR	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_BR	2011-07-02 15:37:19.915322814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-pt_PT abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_PT
---- abiword-2.8.6/user/wp/templates/normal.awt-pt_PT	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_PT	2011-07-02 15:37:20.035382813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ru abiword-libre-2.8.6/user/wp/templates/normal.awt-ru
---- abiword-2.8.6/user/wp/templates/normal.awt-ru	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ru	2011-07-02 15:37:19.907318814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ru_RU abiword-libre-2.8.6/user/wp/templates/normal.awt-ru_RU
---- abiword-2.8.6/user/wp/templates/normal.awt-ru_RU	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ru_RU	2011-07-02 15:37:19.919324814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sk_SK abiword-libre-2.8.6/user/wp/templates/normal.awt-sk_SK
---- abiword-2.8.6/user/wp/templates/normal.awt-sk_SK	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sk_SK	2011-07-02 15:37:20.075402813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sl abiword-libre-2.8.6/user/wp/templates/normal.awt-sl
---- abiword-2.8.6/user/wp/templates/normal.awt-sl	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sl	2011-07-02 15:37:20.031380813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sv abiword-libre-2.8.6/user/wp/templates/normal.awt-sv
---- abiword-2.8.6/user/wp/templates/normal.awt-sv	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sv	2011-07-02 15:37:20.015372813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sv_SE abiword-libre-2.8.6/user/wp/templates/normal.awt-sv_SE
---- abiword-2.8.6/user/wp/templates/normal.awt-sv_SE	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sv_SE	2011-07-02 15:37:20.067398813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-syr abiword-libre-2.8.6/user/wp/templates/normal.awt-syr
---- abiword-2.8.6/user/wp/templates/normal.awt-syr	2007-01-14 12:52:46.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-syr	2011-07-02 15:37:20.079404813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:syr; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:syr; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-tr abiword-libre-2.8.6/user/wp/templates/normal.awt-tr
---- abiword-2.8.6/user/wp/templates/normal.awt-tr	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-tr	2011-07-02 15:37:19.903316814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-tr_TR abiword-libre-2.8.6/user/wp/templates/normal.awt-tr_TR
---- abiword-2.8.6/user/wp/templates/normal.awt-tr_TR	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-tr_TR	2011-07-02 15:37:19.911320814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-uk_UA abiword-libre-2.8.6/user/wp/templates/normal.awt-uk_UA
---- abiword-2.8.6/user/wp/templates/normal.awt-uk_UA	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-uk_UA	2011-07-02 15:37:20.003366813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ur_PK abiword-libre-2.8.6/user/wp/templates/normal.awt-ur_PK
---- abiword-2.8.6/user/wp/templates/normal.awt-ur_PK	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ur_PK	2011-07-02 15:37:20.067398813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-yi abiword-libre-2.8.6/user/wp/templates/normal.awt-yi
---- abiword-2.8.6/user/wp/templates/normal.awt-yi	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-yi	2011-07-02 15:37:19.919324814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-zh_CN abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_CN
---- abiword-2.8.6/user/wp/templates/normal.awt-zh_CN	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_CN	2011-07-02 15:37:20.015372813 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-zh_TW abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_TW
---- abiword-2.8.6/user/wp/templates/normal.awt-zh_TW	2007-01-20 13:20:58.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_TW	2011-07-02 15:37:19.907318814 -0300
-@@ -9,7 +9,7 @@
- <!-- =====================================================================  -->
- 
- <styles>
--<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
-+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Liberation Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
- <section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
-diff -auNpr abiword-2.8.6/user/wp/templates/Press-Release.awt abiword-libre-2.8.6/user/wp/templates/Press-Release.awt
---- abiword-2.8.6/user/wp/templates/Press-Release.awt	2009-05-22 07:15:33.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/Press-Release.awt	2011-07-02 15:37:20.071400813 -0300
-@@ -16,19 +16,19 @@
- <version id="3" started="1080258930" uid="0c5a8b0e-7ec0-11d8-92e5-d7901b3e7f1a" auto="0"/>
- </history>
- <styles>
--<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Arial; margin-top:0pt; font-style:normal; margin-left:0.5000in; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.5000in; color:000000; font-size:12pt; line-height:1.000000; text-align:left; widows:2; font-stretch:normal"/>
--<s followedby="Normal" name="Heading 1" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:17pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Arial"/>
--<s followedby="Press Release" name="Press Release" basedon="Normal" type="P" props="font-weight:normal; font-family:Arial; margin-top:0.1667in; font-style:normal; margin-left:0.5000in; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.5000in; color:000000; font-size:12pt; line-height:1.000000; text-align:left; widows:2; font-stretch:normal"/>
--<s followedby="About Companies" name="About Companies" basedon="Press Release" type="P" props="font-weight:normal; font-family:Arial; margin-top:0.1111in; font-style:normal; margin-left:0.7500in; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.7500in; color:000000; font-size:10pt; line-height:1.000000; text-align:justify; widows:2; font-stretch:normal"/>
-+<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Liberation Sans; margin-top:0pt; font-style:normal; margin-left:0.5000in; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.5000in; color:000000; font-size:12pt; line-height:1.000000; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Normal" name="Heading 1" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:17pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Liberation Sans"/>
-+<s followedby="Press Release" name="Press Release" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Sans; margin-top:0.1667in; font-style:normal; margin-left:0.5000in; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.5000in; color:000000; font-size:12pt; line-height:1.000000; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="About Companies" name="About Companies" basedon="Press Release" type="P" props="font-weight:normal; font-family:Liberation Sans; margin-top:0.1111in; font-style:normal; margin-left:0.7500in; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0.7500in; color:000000; font-size:10pt; line-height:1.000000; text-align:justify; widows:2; font-stretch:normal"/>
- <s type="P" name="Block Text" basedon="Normal" followedby="Current Settings" props="line-height:1.000000; margin-bottom:0.0833in; margin-right:1.0000in; margin-left:1.0000in"/>
- <s type="P" name="Box List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Box List; line-height:1.000000; text-indent:-0.300000in"/>
- <s type="P" name="Bullet List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Symbol; list-style:Bullet List; line-height:1.000000; text-indent:-0.300000in"/>
--<s followedby="Normal" name="Chapter Heading" basedon="Numbered Heading 1" type="P" props="list-delim:Chapter %L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Arial; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:1.100000in/L0"/>
-+<s followedby="Normal" name="Chapter Heading" basedon="Numbered Heading 1" type="P" props="list-delim:Chapter %L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Liberation Sans; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:1.100000in/L0"/>
- <s followedby="Normal" name="Contents 1" basedon="Normal" type="P" props="list-delim:%L.; list-decimal:.; field-color:transparent; start-value:1; margin-left:0.5000in; field-font:NULL; list-style:Numbered List; line-height:1.000000; text-indent:-0.300000in"/>
- <s followedby="Normal" name="Contents 2" basedon="Normal" type="P" props="list-delim:%L.; list-decimal:.; field-color:transparent; start-value:1; margin-left:1.0000in; field-font:NULL; list-style:Numbered List; line-height:1.000000; text-indent:-0.300000in"/>
- <s followedby="Normal" name="Contents 3" basedon="Normal" type="P" props="list-delim:%L.; list-decimal:.; field-color:transparent; start-value:1; margin-left:1.5000in; field-font:NULL; list-style:Numbered List; line-height:1.000000; text-indent:-0.300000in"/>
- <s followedby="Normal" name="Contents 4" basedon="Normal" type="P" props="list-delim:%L.; list-decimal:.; field-color:transparent; start-value:1; margin-left:2.0000in; field-font:NULL; list-style:Numbered List; line-height:1.000000; text-indent:-0.300000in"/>
--<s followedby="Normal" name="Contents Header" basedon="Normal" type="P" props="margin-top:0.1667in; font-size:16pt; margin-bottom:0.0833in; text-align:center; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Arial"/>
-+<s followedby="Normal" name="Contents Header" basedon="Normal" type="P" props="margin-top:0.1667in; font-size:16pt; margin-bottom:0.0833in; text-align:center; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Liberation Sans"/>
- <s type="P" name="Dashed List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:NULL; list-style:Dashed List; line-height:1.000000; text-indent:-0.300000in"/>
- <s type="P" name="Diamond List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Diamond List; line-height:1.000000; text-indent:-0.300000in"/>
- <s type="C" name="Endnote Reference" basedon="None" followedby="Current Settings" props="text-position:superscript; line-height:1.000000; font-size:10pt"/>
-@@ -36,19 +36,19 @@
- <s type="C" name="Footnote Reference" basedon="None" followedby="Current Settings" props="text-position:superscript; line-height:1.000000; font-size:10pt"/>
- <s type="C" name="Footnote Text" basedon="Normal" followedby="Current Settings" props="text-position:normal; line-height:1.000000; font-size:10pt"/>
- <s type="P" name="Hand List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Hand List; line-height:1.000000; text-indent:-0.300000in"/>
--<s followedby="Normal" name="Heading 2" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:14pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Arial"/>
--<s followedby="Normal" name="Heading 3" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:12pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Arial"/>
--<s followedby="Normal" name="Heading 4" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:12pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Arial"/>
-+<s followedby="Normal" name="Heading 2" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:14pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Liberation Sans"/>
-+<s followedby="Normal" name="Heading 3" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:12pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Liberation Sans"/>
-+<s followedby="Normal" name="Heading 4" basedon="Normal" type="P" props="margin-top:0.3056in; font-size:12pt; margin-bottom:0.0417in; line-height:1.000000; font-weight:bold; keep-with-next:1; font-family:Liberation Sans"/>
- <s type="P" name="Heart List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Heart List; line-height:1.000000; text-indent:-0.300000in"/>
- <s type="P" name="Implies List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Symbol; list-style:Implies List; line-height:1.000000; text-indent:-0.300000in"/>
- <s type="P" name="Lower Case List" basedon="Numbered List" followedby="Current Settings" props="list-delim:%L); list-decimal:.; field-color:transparent; start-value:1; margin-left:0.5000in; field-font:NULL; list-style:Lower Case List; line-height:1.000000; text-indent:-0.300000in"/>
- <s type="P" name="Lower Roman List" basedon="Normal" followedby="Current Settings" props="list-delim:%L; list-decimal:.; field-color:transparent; start-value:1; margin-left:0.5000in; field-font:NULL; list-style:Lower Roman List; line-height:1.000000; text-indent:-0.300000in"/>
--<s followedby="Normal" name="Numbered Heading 1" basedon="Heading 1" type="P" props="list-delim:%L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Arial; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:0.299306in/L0"/>
--<s followedby="Normal" name="Numbered Heading 2" basedon="Heading 2" type="P" props="list-delim:%L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Arial; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:0.299306in/L0"/>
--<s followedby="Normal" name="Numbered Heading 3" basedon="Heading 3" type="P" props="list-delim:%L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Arial; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:0.299306in/L0"/>
-+<s followedby="Normal" name="Numbered Heading 1" basedon="Heading 1" type="P" props="list-delim:%L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Liberation Sans; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:0.299306in/L0"/>
-+<s followedby="Normal" name="Numbered Heading 2" basedon="Heading 2" type="P" props="list-delim:%L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Liberation Sans; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:0.299306in/L0"/>
-+<s followedby="Normal" name="Numbered Heading 3" basedon="Heading 3" type="P" props="list-delim:%L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Liberation Sans; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:0.299306in/L0"/>
- <s type="P" name="Numbered List" followedby="Current Settings" props="list-delim:%L.; list-decimal:.; field-color:transparent; start-value:1; margin-left:0.5000in; field-font:NULL; list-style:Numbered List; line-height:1.000000; text-indent:-0.300000in"/>
- <s type="P" name="Plain Text" basedon="Normal" followedby="Current Settings" props="font-family:Courier New; line-height:1.000000"/>
--<s followedby="Normal" name="Section Heading" basedon="Numbered Heading 1" type="P" props="list-delim:Section %L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Arial; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:1.100000in/L0"/>
-+<s followedby="Normal" name="Section Heading" basedon="Numbered Heading 1" type="P" props="list-delim:Section %L.; field-color:transparent; start-value:1; margin-left:0.0in; field-font:Liberation Sans; list-style:Numbered List; line-height:1.000000; text-indent:0.0in; tabstops:1.100000in/L0"/>
- <s type="P" name="Square List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Square List; line-height:1.000000; text-indent:-0.300000in"/>
- <s type="P" name="Star List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Star List; line-height:1.000000; text-indent:-0.300000in"/>
- <s type="P" name="Tick List" followedby="Current Settings" props="list-delim:%L; list-decimal:NULL; field-color:transparent; start-value:0; margin-left:0.5000in; field-font:Dingbats; list-style:Tick List; line-height:1.000000; text-indent:-0.300000in"/>
-@@ -77,7 +77,7 @@
- <p style="Normal"><c props="lang:en-US"></c></p>
- </cell>
- <cell props="bot-attach:3; left-attach:0; right-attach:1; top-attach:2">
--<p style="Normal" props="text-align:center"><c props="font-family:Arial; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">FOR IMMEDIATE RELEASE</c></p>
-+<p style="Normal" props="text-align:center"><c props="font-family:Liberation Sans; font-size:12pt; color:000000; text-decoration:none; text-position:normal; font-weight:normal; font-style:normal; lang:en-US">FOR IMMEDIATE RELEASE</c></p>
- </cell>
- </table>
- <p></p>
-diff -auNpr abiword-2.8.6/user/wp/templates/Resume.awt abiword-libre-2.8.6/user/wp/templates/Resume.awt
---- abiword-2.8.6/user/wp/templates/Resume.awt	2009-05-22 07:15:36.000000000 -0300
-+++ abiword-libre-2.8.6/user/wp/templates/Resume.awt	2011-07-02 15:37:20.031380813 -0300
-@@ -14,11 +14,11 @@
- <m key="abiword.date_last_changed">Fri Mar 12 22:08:25 2004</m>
- </metadata>
- <styles>
--<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Arial; margin-top:0pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:9pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
--<s followedby="Normal" name="Heading 1" basedon="Normal" type="P" props="font-weight:bold; margin-top:22pt; keep-with-next:1; margin-bottom:3pt; font-family:Arial; font-size:20pt"/>
--<s followedby="Normal" name="Heading 2" basedon="Normal" type="P" props="margin-top:22pt; font-size:11pt; margin-bottom:3pt; font-weight:normal; text-align:right; font-family:Arial; keep-with-next:1"/>
--<s followedby="Normal" name="Heading 3" basedon="Normal" type="P" props="font-weight:bold; margin-top:22pt; keep-with-next:1; margin-bottom:3pt; font-family:Arial; font-size:9pt"/>
--<s followedby="Heading 3" name="Brief" basedon="Normal" type="P" props="font-weight:normal; font-family:Arial; margin-top:0pt; font-style:normal; margin-left:0.2500in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:9pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:9pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Current Settings" name="Normal" type="P" props="font-weight:normal; font-family:Liberation Sans; margin-top:0pt; font-style:normal; margin-left:0pt; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:0pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:9pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
-+<s followedby="Normal" name="Heading 1" basedon="Normal" type="P" props="font-weight:bold; margin-top:22pt; keep-with-next:1; margin-bottom:3pt; font-family:Liberation Sans; font-size:20pt"/>
-+<s followedby="Normal" name="Heading 2" basedon="Normal" type="P" props="margin-top:22pt; font-size:11pt; margin-bottom:3pt; font-weight:normal; text-align:right; font-family:Liberation Sans; keep-with-next:1"/>
-+<s followedby="Normal" name="Heading 3" basedon="Normal" type="P" props="font-weight:bold; margin-top:22pt; keep-with-next:1; margin-bottom:3pt; font-family:Liberation Sans; font-size:9pt"/>
-+<s followedby="Heading 3" name="Brief" basedon="Normal" type="P" props="font-weight:normal; font-family:Liberation Sans; margin-top:0pt; font-style:normal; margin-left:0.2500in; lang:en-US; font-variant:normal; text-indent:0in; margin-bottom:9pt; text-decoration:none; bgcolor:transparent; margin-right:0pt; color:000000; font-size:9pt; line-height:1.0; text-align:left; widows:2; font-stretch:normal"/>
- </styles>
- <pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
- <section header="0" props="page-margin-footer:0.5in; page-margin-header:0.4375in; page-margin-top:1.1250in">
diff --git a/extra/dbus/PKGBUILD b/extra/dbus/PKGBUILD
index cf090c035..26a7f7001 100644
--- a/extra/dbus/PKGBUILD
+++ b/extra/dbus/PKGBUILD
@@ -4,7 +4,7 @@
 #
 pkgname=dbus
 pkgver=1.4.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64 'mips64el')
diff --git a/extra/gmetadom/PKGBUILD b/extra/gmetadom/PKGBUILD
index d582d3737..4dd38268a 100644
--- a/extra/gmetadom/PKGBUILD
+++ b/extra/gmetadom/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=gmetadom
 pkgver=0.2.6
-pkgrel=2
+pkgrel=3
 pkgdesc="C++ bindings for GDome2 DOM implementation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gmetadom.sourceforge.net/"
@@ -20,7 +20,9 @@ md5sums=('7bfb5d9c6f20ffa5e790b63d1f8cb481'
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/gmetadom-0.2.6-gcc43.patch || return 1
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-static
+  # Don't make tests, they need a static library.
+  sed -ri 's/^SUBDIRS = (.+) test$/SUBDIRS = \1/' src/gdome_cpp_smart/Makefile
   make || return 1
   make DESTDIR=${pkgdir}/ install
 }
diff --git a/extra/libwebkit/PKGBUILD b/extra/libwebkit/PKGBUILD
index a92973938..aa2207e39 100644
--- a/extra/libwebkit/PKGBUILD
+++ b/extra/libwebkit/PKGBUILD
@@ -10,19 +10,29 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://webkitgtk.org/"
 license=('custom')
 depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant')
+checkdepends=('hspell')
 makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
 options=('!libtool')
 install=libwebkit.install
 source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz
-        replace-switch-with-given-when.patch)
-md5sums=('361f8420e93d12101d650758fec09fa0'
-         '3ba708a26b7af0e1e853867966fe14f7')
+        replace-switch-with-given-when.patch
+        fix-mips-n32.patch)
 
 build() {
   cd "${srcdir}/webkit-${pkgver}"
 #  patch -Np1 -i "${srcdir}/replace-switch-with-given-when.patch"
   mkdir build-gtk{2,3}
 
+  # WebKit knows only O32, not aligning memory on N32, also wants to
+  # use nonavailable JIT for all MIPS.
+  patch -Np1 -i "${srcdir}/fix-mips-n32.patch"
+
+  # ld needs more virtual memory than is available on MIPS n32, these
+  # options should reduce it.
+  if [ "${CARCH}" == "mips64el" ] ; then
+      export LDFLAGS="${LDFLAGS} -Wl,--reduce-memory-overhead -Wl,--no-keep-memory"
+  fi
+
   ( cd build-gtk2 && _build --with-gtk=2.0 )
   ( cd build-gtk3 && _build --with-gtk=3.0 )
 }
@@ -36,6 +46,12 @@ _build() {
   make all stamp-po
 }
 
+check() {
+  cd "${srcdir}/webkit-${pkgver}"
+  make -C build-gtk2 check
+  make -C build-gtk3 check
+}
+
 package_libwebkit() {
   pkgdesc+=" (for GTK2)"
   depends+=(gtk2)
@@ -56,3 +72,6 @@ package_libwebkit3() {
   make DESTDIR="${pkgdir}" install
   install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit3/LICENSE"
 }
+md5sums=('361f8420e93d12101d650758fec09fa0'
+         '3ba708a26b7af0e1e853867966fe14f7'
+         '1e1971b0214f6705ceb4f816c4b52af9')
diff --git a/extra/libwebkit/fix-mips-n32.patch b/extra/libwebkit/fix-mips-n32.patch
new file mode 100644
index 000000000..0acc0daf6
--- /dev/null
+++ b/extra/libwebkit/fix-mips-n32.patch
@@ -0,0 +1,25 @@
+--- webkit-1.4.1.orig/Source/JavaScriptCore/wtf/Platform.h	2011-06-30 12:14:01.572119909 +0200
++++ webkit-1.4.1/Source/JavaScriptCore/wtf/Platform.h	2011-06-30 12:17:00.352382262 +0200
+@@ -139,8 +139,9 @@
+ 
+ /* CPU(MIPS) - MIPS 32-bit */
+ /* Note: Only O32 ABI is tested, so we enable it for O32 ABI for now.  */
++/* N32 is also tested, without JIT. */
+ #if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) \
+-    && defined(_ABIO32)
++  && (defined(_ABIO32) || defined(_ABIN32))
+ #define WTF_CPU_MIPS 1
+ #if defined(__MIPSEB__)
+ #define WTF_CPU_BIG_ENDIAN 1
+@@ -1009,9 +1010,9 @@
+ #define ENABLE_JIT 0
+ #endif
+ 
+-/* The JIT is enabled by default on all x86, x64-64, ARM & MIPS platforms. */
++/* The JIT is enabled by default on all x86, x64-64, ARM & MIPS O32 platforms. */
+ #if !defined(ENABLE_JIT) \
+-    && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(MIPS)) \
++    && (CPU(X86) || CPU(X86_64) || CPU(ARM) || (CPU(MIPS) && defined(_ABIO32))) \
+     && (OS(DARWIN) || !COMPILER(GCC) || GCC_VERSION_AT_LEAST(4, 1, 0)) \
+     && !OS(WINCE)
+ #define ENABLE_JIT 1
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index 1b5bef530..fd8125c2c 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -9,7 +9,11 @@ pkgdesc="Maxima - a sophisticated computer algebra system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://maxima.sourceforge.net"
-depends=('sbcl=1.0.49' 'texinfo' 'sh')
+if [ "${CARCH}" == "mips64el" ] ; then
+    depends=('clisp' 'texinfo' 'sh')
+else
+    depends=('sbcl=1.0.49' 'texinfo' 'sh')
+fi
 makedepends=('python2')
 optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
 # needs rebuild when bash changes version
@@ -25,9 +29,14 @@ build() {
 
   # set correct python executable to create docs
   sed -i "s|${PYTHONBIN:-python}|python2|" doc/info/extract_categories.sh
-	
+
+  if [ "${CARCH}" == "mips64el" ] ; then
+      lisp="--enable-clisp --with-default-lisp=clisp"
+  else
+      lisp="--enable-sbcl --with-default-lisp=sbcl"
+  fi
   ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
-	--libexecdir=/usr/lib --enable-sbcl --with-default-lisp=sbcl
+	--libexecdir=/usr/lib $lisp
   make
 }
 
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index fe18cff28..68afc9243 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -13,6 +13,8 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ruby-lang.org/en/"
 license=('custom')
 makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz')
+[ "$CARCH" = "mips64el" ] && \
+makedepends=('openssl' 'tk' 'libffi' 'doxygen')
 options=('!emptydirs')
 source=("ftp://ftp.ruby-lang.org/pub/${pkgbase}/1.9/${pkgbase}-${pkgver//_/-}.tar.bz2")
 md5sums=('68510eeb7511c403b91fe5476f250538')
diff --git a/extra/xfce-utils/PKGBUILD b/extra/xfce-utils/PKGBUILD
index 608b29483..c2357428b 100644
--- a/extra/xfce-utils/PKGBUILD
+++ b/extra/xfce-utils/PKGBUILD
@@ -30,7 +30,7 @@ build() {
 	--disable-static \
 	--enable-dbus \
 	--disable-debug \
-	--with-vendor-info=ArchLinux # 	--enable-gen-doc \
+	--with-vendor-info=Parabola # 	--enable-gen-doc \
   make
 }