[PATCH] Import Simon Marshall's unique.el