Hi David,

this patch had already been partially applied by Carsten and Eric (in
slightly a different way than I suggested).  The changes to ob.el and
ob-ref.el (the require statements) are therefore superfluous and should
probably be backed out.  There was also a superfluous whitespace change
in org.el (a closing paren that was broken onto the next line).  Patch
to this effect is attached.  You've already cleaned up org-agenda.el and
the conditions in org-macs...