From 85152ef35ca6c87af4fcfb32c8ac87a91f2f6ed3 Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Sun, 22 Jan 2012 23:41:34 +0000
Subject: [PATCH] Expand the Id keyword.