French Onion Soup

2 tablespoons butter

1 tablespoon olive oil

4 cups beef or vegetable broth

1 cup dry white wine (optional)

1 teaspoon thyme

1 bay leaf

Salt and pepper to taste