[mythtv] Softpad branch?

[William Uther]

Hi all,

   I've been using the softpad branch merged in to trunk for a  
while.  It has been working quite well and is very useful here in  
Australia.

   I was wondering if this will be merged into trunk any time soon?

   At the moment I get occasional conflicts when updating that I have  
to spend time to fix.  Is there a reason it can't be merged into trunk?

Cheers,

Will        :-}