As the following article reports it didn't become the hot clash between Cisco and Apple we were all hoping for. They just agreed on using both the name 'iPhone'.

Previous post if you didn't catch the story at the beginning.

http://www.nytimes.com