Awwww RIM and Motorola kissed and made up