Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.1261
diff -u -p -r1.1261 common.inc
--- includes/common.inc	20 Nov 2010 09:46:22 -0000	1.1261
+++ includes/common.inc	20 Nov 2010 12:26:00 -0000
@@ -7415,6 +7415,10 @@ function entity_uri($entity_type, $entit
 /**
  * Returns the label of an entity.
  *
+ * If the entity's definition in hook_entity_info() specifies 'label callback'
+ * then that is called; otherwise the entity's label as given by 'entity keys'
+ * is returned.
+ *
  * @param $entity_type
  *   The entity type; e.g. 'node' or 'user'.
  * @param $entity