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.