Hi,
I meant to comment on this when ACK'ing #1597 this morning: the model annotations were
not updated to reflect the changes, but I realized they weren't up to date anyway, so
I elected to just fix them in a separate patch.
Please see Martyn's email from January about the process for annotating models so we
stay current:
https://fedorahosted.org/pipermail/aeolus-devel/2011-January/000017.html