I have an Olympus C740, which is a 3.2MP point and shoot with a 10X (380mm 35mm equiv) Optical zoom and a macro mode with focusing down to 1.2" in macro mode. I've found it to be very good for aquarium photos, plus it's a great camera to carry around with you in case sasquatch runs out in front of you. It has every setting from full auto to full manual (including focus). You can pick one up for around $250.00.
The lens is what sold me on the camera, and for the money, I'd put it up against anything Canon has in the same price range, and I'm a fairly fanatic Canon person, all my film equipment is Canon, but quite frankly, I haven't found a situation yet where the Olympus hasn't delivered. The film equipment has been spending more and more time in the bag at home.