It was a merger between the two stocks actually. Now adobe stockholders get like .1 % of shares of Macromedia.
With both of these giant web development companies working together (or, rather as 1).. who knows what we could see. You could design a vector image in Macromedia Illustrator, and then import it into Adobe Flash and have a good old time! imagine the possibilities...