IIRC, Our games at D+3 showed it to be 2 luxuries period.
http://forums.civfanatics.com/showthread.php?p=1425988&highlight=double+unhappy#post1425988
http://forums.civfanatics.com/showthread.php?p=1425988&highlight=double+unhappy#post1425988