combining rows from two fields plus non matches

Hi... I have tried all night to figure out how to create a query that will take two tables and result in rows which contain all of the data from both tables, but merge rows where a certain column in one table matches a certain column from the other.

As an example:

table one has 4 columns
id, descript, qty, code

there are four rows of data in it -- all different id numbers


Table two has 2 columns
id, qty

there are 2 rows of data in it -- one has the same id as an item in table one, the other has an id that is not in table one.

I want the result to be columns which contain all the column names from both tables -- 5 rows total... (the matching ids should merge into one row) and the places where there are no matches have empty columns where data was not found.

The best I have been able to do is get 4 rows where the one id match merged (Left Join) and the one row in table two which had an id that did not match table one did not get listed.

can anyone suggest a solution?

thanks

GF