adium/adium

merge from default
ARC
2012-06-09, Frank Dowsett
3692c6d45956
merge from default
4151ac3a3b1f9847b8d958f1c7d57a345d442266 1.5