r5093 - in trunk: cumin/resources wooly/resources