Was the Garden of Eden created on the third or sixth day of Creation?

I am having serious problems interpreting this passage from Genesis involving the Garden of Eden. According to Genesis 2:8-17, where the creation of the Garden is described, it seems to say that the Garden of Eden was created on the sixth day, but Genesis 1:9-13 says that it was only on the third day that God created the plants and grasses on earth - wouldn't that also include Eden with the Tree of Life and the Tree of Knowledge of Good and Evil? Is Genesis 2:8-17 just a "recap" of Genesis 1:9-13?