adium progress
Merge branch 'adium'