adium/adium

merge from default (one day this will go the other way)
PreferencesRedux
2012-02-05, Frank Dowsett
2fccfd63d2f8
merge from default (one day this will go the other way)
#if __OBJC__
# import <Cocoa/Cocoa.h>
#endif
#import <CoreFoundation/CoreFoundation.h>
#import <CoreFoundation/CFPlugInCOM.h>
#import <CoreServices/CoreServices.h>
#import <ApplicationServices/ApplicationServices.h>