How/when should we handle the merging of our code? I think I'm starting to run to the limit of features I had thought of. I also imagine Maemo 4.1 users might be a bit interested in getting support for that platform merged in,