Problem building sgml-common-native

After a Poky/Yocto repo refresh today, I'm now getting an error when [re]building sgml-common-native:

| DEBUG: Staging files from /local/p0382-cutting-edge_2014-11-21/tmp/work/x86_64-linux/sgml-common-native/0.6.3-r1/sysroot-destdir/local/p0382-cutting-edge_2014-11-21/tmp/sysroots/x86_64-linux to /local/p0382-cutting-edge_2014-11-21/tmp/sysroots/x86_64-linux
| DEBUG: Executing shell function sgml_common_sstate_postinst
| install-catalog: addition of /local/p0382-cutting-edge_2014-11-21/tmp/sysroots/x86_64-linux/etc/sgml/sgml-ent.cat in /local/p0382-cutting-edge_2014-11-21/tmp/sysroots/x86_64-linux/etc/sgml/sgml-docbook.cat
| Warning: /local/p0382-cutting-edge_2014-11-21/tmp/sysroots/x86_64-linux/etc/sgml/sgml-ent.cat is already installed in the centralized catalog /local/p0382-cutting-edge_2014-11-21/tmp/sysroots/x86_64-linux/etc/sgml/sgml-docbook.cat
| install-catalog: addition of /local/p0382-cutting-edge_2014-11-21/tmp/sysroots/x86_64-linux/etc/sgml/sgml-docbook.cat in /local/p0382-cutting-edge_2014-11-21/tmp/sysroots/x86_64-linux/etc/sgml/catalog
| install-catalog: "/local/p0382-cutting-edge_2014-11-21/tmp/sysroots/x86_64-linux/etc/sgml/sgml-docbook-dtd-3.1.cat" does not exist or is empty.
| WARNING: exit code 2 from a shell command.
| DEBUG: Python function sstate_task_postfunc finished
| ERROR: Function failed: sgml_common_sstate_postinst (log file is located at /local/p0382-cutting-edge_2014-11-21/tmp/work/x86_64-linux/sgml-common-native/0.6.3-r1/temp/log.do_populate_sysroot.6449)

ERROR: Task 5213 (/local/poky-cutting-edge/meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb, do_populate_sysroot) failed with exit code '1'

This seems to contradict the latest change to this recipe:

commit a0c83577cc108aaae8632fe44f0c1bd46995b264
Author: Robert Yang <[email protected]>
Date: Tue Mar 18 15:54:34 2014 +0800
sgml-common-native: fix the generation of sgml-docbook.cat

I think there must be some missing dependencies here - to fix it, I had to manually clean these recipes:
docbook-dsssl-stylesheets-native docbook-sgml-dtd-3.1-native
openjade-native

Note: I'm not sure how my build got into this state. I had built in this tree successfully yesterday from
poky-master:2578ff3dfe55a1c07208401861f96e2e327eacaf
today I'm using
poky-master:ba07a69f3dc8fb798e372130bf665d059fed9d42

------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------