In a large non-stick ovenproof skillet, brown the potatoes and onion in the oil and butter for 15 to 20 minutes or until tender and golden brown. Season with salt and pepper. Add oil, if needed. Stir in the tomatoes, olives and garlic. Adjust the seasoning. Set aside.