Fixed conflicts introduced in last merge from Vladimir
authorDrew Crampsie <drewc@tech.coop>
Wed, 29 Jun 2005 22:21:32 +0000 (15:21 -0700)
committerDrew Crampsie <drewc@tech.coop>
Wed, 29 Jun 2005 22:21:32 +0000 (15:21 -0700)
For some reason i can't seem to apply Vladimir's darcs patches (bad patch bundle).

I will sort this out eventually.

darcs-hash:20050629222132-5417e-1c3a6ec82da95571dc19e5d4b757620ef793edfb.gz


No differences found