Merge branch 'master' into apache
authorRafael Monnerat <rafael@nexedi.com>
Wed, 13 Jul 2011 22:06:56 +0000 (19:06 -0300)
committerRafael Monnerat <rafael@nexedi.com>
Wed, 13 Jul 2011 22:06:56 +0000 (19:06 -0300)
commitf6bccece229138414c9d2a5299247f60f4adda76
tree6e66c39fbc92063d73c530ade087a6b203d5a340
parentc19a0082d541b51313a561878b04f9955ddc1c49
parentf7fdb589e88a0fb5a6d0e300c6002e253f418981
Merge branch 'master' into apache

Conflicts:
CHANGES.txt
component/slapos/buildout.cfg
setup.py
slapos/recipe/kumofs/__init__.py
slapos/recipe/memcached/__init__.py
slapos/recipe/mysql/__init__.py
software/kumofs/software.cfg
software/mysql-5.1/software.cfg
CHANGES.txt
component/slapos/buildout.cfg
setup.py