#28 Fix for RendezVous in CVS

[Mathieu Masseboeuf]

Fix for RendezVous in CVS due to changes in the adium framework
and to some conflicts due to the new sound code (I think)

[Mathieu Masseboeuf]

[Evan Schoenberg]

Logged In: YES
user_id=669684

Forgot to close this. Thanks.