It was announced today that Apple and Cisco have resolved their differences about the use of the name iPhone.

The problems arose when Steve Jobs announced the release of the Apple iPhone at the MacWorld convention. Cisco immediately came forward and claimed that they owned the trademark for the iPhone. They intended to distribute and Internet phone with that name.

While many of the terms of their agreement have been kept confidential, they have publicly stated that they can both use the name iPhone to market separate products.