adium/adium

adium/adium/
merge from default
ARC
2012-04-30, Frank Dowsett
2a5620498798