Merge commit 'iamcalvo/master'
commit503df14662316fd77a99d77f0a09183a885126ed
authormanom <aoeu@aoeu.aoeu>
Fri, 8 Jun 2007 00:26:36 +0000 (8 02:26 +0200)
committermanom <aoeu@aoeu.aoeu>
Fri, 8 Jun 2007 00:26:36 +0000 (8 02:26 +0200)
treedabd40cd414d3b55bd74c55bf6caca50cccfab61
parentf075ba43660c0bd42ed6a84e45c4e839f487777b
parentddca51574be9f7f9285dce4f96f29bc46c76b69b
Merge commit 'iamcalvo/master'

Conflicts:

readme
readme