We are never supposed to merge anything. We are supposed to just follow
upstream. pull merges, so it's just the wrong tool.
Instead, fetch and reset.
It is not a problem to always reset, as user already cannot rely on
repository's survival across updates: if there is any error reported by
git command, the repository will be wiped out. So resetting will not do
any more harm than what can already happen.
Also, properly quote paths to protect against spaces (in both command and
update-command).

reason:
 - Expires header is widely supported than max-age. e.g.: HTTP/1.0 clients.
 - max-age directive always overrides Expires setting under HTTP/1.1,
   so there is no need to remove Expires here.

so that varnish recipe can be used without webchecker.

(cherry picked from commit c060818b385d8af429725fb9c53fdb8068ad21d5)

(cherry picked from commit 7d8d21d815e6a99ba5959d28b7d59c69d034e8c3)

6.7.6-7 fixes issue of darkening some images.
(cherry picked from commit 62885346a1b66d7d7d94b682c37316ad0b622a6a)

(cherry picked from commit 22b4543965c38a5b6c78730240c3dbfdd8079781)

The librsvg contains rsvg-convert, the command used by imagemagic
to convert svg to png.

This is a cosmetic modification. Functionally, there is no change.

"Introduce the best practices from erp5 public web sites experience."
1ed2b682

This commit only includes functional modification.

This reverts commit 1ed2b682.

add a workaround for https://bugs.launchpad.net/maria/+bug/985828 that causes wrong result in Resource_zGetInventoryList etc.
(cherry picked from commit f22f2c9d5718ecf0229eb947cbac7ed335427310)

commit d42a85e53c313984de1dbeb7ca8eb432a5286c3a
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Apr 18 14:12:11 2012 +0200

    version up : Apache httpd 2.4.2.

commit bbbd38c26ba87cf2b0fd2c17414c99fa84d36dbc
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Fri Apr 13 12:41:47 2012 +0200

    version up : Python 2.7.3.

commit 09de24474197a0650f8b67003007d295efe532d9
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Apr 11 18:09:08 2012 +0200

    follow the change of mariadb header location.

commit ba53784a3d34f75a2f49c63b6f78f15c2758e48b
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Apr 11 18:06:10 2012 +0200

    add mroonga-2.01-mariadb-5.5.23.patch.

commit 165486e2ce57e7a13b92b8d407b3e019b6e8b4fb
Merge: afc2f29 783ed21b
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Apr 11 17:24:16 2012 +0200

    Merge remote-tracking branch 'origin/erp5' into erp5-component

commit afc2f2905faf0af1b938c664fa75a45cfb7ae7d5
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Apr 11 17:24:13 2012 +0200

    version up : MariaDB 5.5.23.

commit b49ffa1de1ee7c1833358a1c9b069eb82b50f5b0
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Apr 11 17:20:27 2012 +0200

    version up : Python 2.6.8.

commit 3e36266d47faff6b6700f41fbd76caa0cf021bbe
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Thu Apr 5 22:02:58 2012 +0200

    clear pre-defined system glib header path, because it has higher priority than our own specified one.

commit 2b9d6b0036adf4564379ff74558fc00c4a475a75
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Thu Apr 5 14:44:56 2012 +0200

    sphinx_snippets function seems not exist in sphinx storage engine included in mariadb 5.5.

commit c83854cf65be83297287353ac5e5df4240460108
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Thu Apr 5 14:11:12 2012 +0200

    version up : LibreOffice 3.5.2.

commit 6d6becd3697a5905db36b4786909aa19fd370f44
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Apr 4 13:33:17 2012 +0200

    build sphinx storage engine as a dynamic plugin instead of statically embed in mysqld.

Make varnish recipe use 3.0.x version varnish.

More details can be found on:
https://mail.zope.org/pipermail/zodb-dev/2010-April/013287.html

Kudos to Łukasz for noticing.