Merge branch 'experimental'
commitb32789be8e4841770aa23e01f49fbadd35d56e26
authormanom <aoeu@aoeu.aoeu>
Thu, 7 Jun 2007 22:45:05 +0000 (8 00:45 +0200)
committermanom <aoeu@aoeu.aoeu>
Thu, 7 Jun 2007 22:45:05 +0000 (8 00:45 +0200)
tree5fd10610b6ec162a949e236d5bc7eac49b2c3bbe
parent284850d84e418756d4676d3627fbb3f8111bc8b3
parent26b6b2116adc842c1be971ae1f10e5e6156a1b4d
Merge branch 'experimental'

Conflicts:

readme
readme