So I've been checking what I have and comparing to
black nightshade:
http://thebegavalley.org.au/uploads/...nightshade.jpg

and deadly nightshade:
http://www.horsedata.co.uk/images/Pl...nightshade.jpg

So the poisonous one has bell shaped flowers rather than star shaped, and
has smooth edged leaves rather than lobed, yes?

I have these:

http://comps.org/vicky/nightshade1.jpg
http://comps.org/vicky/nightshade2.jpg

(apologies for size of image, didn't convert in case anyone had a strange
desire to zoom in!)
--