Remove the workaround for active trails core bug, now that it's fixed in -dev

Since this hasn't even been available in a released version of core, I suggest we add some conditional checking of version_compare against the VERSION constant and leave the workaround for users that do not upgrade core as fast as modules (very common).

Due to the following core issue http://drupal.org/node/609542 a patch has been suggested to Menu Block (see http://drupal.org/node/618700). However it is dependant on the core workaround. Is there a way to keep the core workaround until http://drupal.org/node/609542 has been fixed?

I know the warning in custom_menu_active_trail.inc, that the file will be removed when #942782 is fixed, but just to mention the dependance with another Menu Block issue.
------------
Edit:
The core issue #609542 seems to be solved in Drupal 7.10 and i18n 7.x-1.2 (after a quick test). So patch in #618700 may be unnecessary when the core workaround is removed.

Mark, yes I am talking about a different core bug workaround. However the patch suggested in the other Menu Block issue (#618700) is a patch for custom_menu_active_trail.inc. It was just to point out a dependency between a suggested patch to another core bug workaround with the code that will be removed. It may be irrelevant in this issue, but I thought it was important to mention the dependency.

I am aware of the warning in custom_menu_active_trail.inc that the file will be removed, when #942782 is fixed.

Anyways as mentioned in my update of my previous post, it seems core issue #609542 is solved in Drupal 7.10 and i18n 7.x-1.2 (after a quick test). So patch in #618700 may be unnecessary when the core workaround is removed according to this issue (I have posted this in #618700 as well).

Handling this in a more proper version with #1425342: Drupal core upgrade from 7.10 to 7.12 causes menu block to fail