adium/adium

adium/adium/
merge adium-1.6 into default

2013-02-14, Frank Dowsett
f1b653a8defa