In 2006 what city in Africa has the greatest population within its city limits?

As of 2004, Cairo, the capital of Egypt, is the African capital with the largest population, about 7.6 million. When the surrounding metropolitan area is included, Cairo has a population of 11.1 million, making it the among the twenty largest cities in the world.

As of 2007 (according to Wikipedia), Lagos, Nigeria has the most population, with over 8,714,228 people. Cairo comes next with over 7,734,334.