adium/adium

adium/adium/
merge this stray commit.

2012-04-24, Frank Dowsett
dd319b165310