Mind rebasing this patch yet again, against version 21 this time? And maybe do it with a preprocessor #define and #ifdef guards. I think in that form it might actually be acceptable by upstream so that it wont have to be continually rebased. -- -Shawn Landden