Felipe,

Here is the patch I just committed, instead of your patch.  I wanted a 
more generic solution, that is easily pluggable into other drivers.

Please test and let me know if you find bugs, or want additions...

	Jeff