In case the OP is still interested, it appears that code has now been checked in post 5.0-tagging:
http://marc.info/?l=openbsd-cvs&m=131359791929505&w=2
Thus, any snapshot generated
afterward (as of Thursday, 18 Aug 2011...) will have this code already integrated.