Keith -

You're right. The melody is based on "La Golondrina" a Mexican song composed by Narciso Serradel Sevilla.

I first learned it on accordion in about 1953.

In my head, it also bears a slight resemblence to another Mexican song called La Paloma.

Jon