Right now, it appears to be doing both.

I really miss Picassa... if it wasn't for a bug in the last version, where it sometimes swapped face tags, I'd still be using it.