Conflicts:
	setup.py

Conflicts:

	setup.py

ChangeLog entry :
* New features
  - Added Unix socket support (e.g. "connect = /var/run/stunnel/socket").
  - Added "verify = 4" mode to ignore CA chain and only verify peer certificate.
  - Removed the limit of 16 IP addresses for a single 'connect' option.
  - Removed the limit of 256 stunnel.conf sections in PTHREAD threading model.
    It is still not possible have more than 63 sections on WIN32 platform.
* Optimizations
  - Reduced per-connection memory usage.
  - Performed a major refactoring of internal data structures.  Extensive
    internal testing was performed, but some regression bugs are expected.
* Bugfixes
  - Fixed WIN32 compilation with Mingw32.
  - Fixed non-blocking API emulation layer in UCONTEXT threading model.
  - Fixed signal handling in UCONTEXT threading model.

Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>

The pacth allows the jdk to be installed without user
interaction.
The jdk 1.6.0 is required to build cubrid.
Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>

Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>

increase version of package netifaces because the version 0.4 is not provided anymore. I used the networkcache configuration to upload the package in the new version

Maatkit is not maintained any more and is replaced by Percona
Toolkit (http://www.percona.com/software/percona-toolkit/).
hostname symlink was added in bin folder of partition since
it is used by some of the percona toolkit tools.

So put out gmp as self component.

Additionaly this selects different lxml egg, and "disables" lxml building hack.
Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>

Additionaly this selects different lxml egg, and "disables" lxml building hack.
Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>

Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>

They are not available on pypi.
Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>

commit 9486fa3d33ed70722df0ab78cf0d60f4b1bcab4b
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Thu Oct 20 12:51:52 2011 +0100

    Add documentation for lamp recipe

commit cb684d1170c04ff6ad193b25fb181c71ccded042
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Thu Oct 20 11:07:40 2011 +0100

    Add PunBB [Forum] software release

commit 1b2209ee64fea3854c4a8d0f9c7be1badaf2addb
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Thu Oct 20 10:24:25 2011 +0100

    Add B2evolution [blog] software release

commit adf2972b4678b47ef8b4debdeecaf08536d131d3
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Thu Oct 20 10:19:01 2011 +0100

    Restore lamp-template/software.cfg after the merge of lamp with master

commit 9b07d7c1a64b6ff346bfe444664787ff60886033
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Wed Oct 19 15:35:46 2011 +0100

    Restore lamp.cfg

commit 4804e7aa0c1f99aad61732955f9da4a486f6aed0
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Wed Oct 19 15:31:37 2011 +0100

    Add comment and fix indentation