adium/adium

adium/adium/
merge from default
ARC
2012-06-09, Frank Dowsett
3692c6d45956