2. If we want to keep our contract with the user about the stable series valid, this change should go into 2.1 only. Otherwise, users doing a "configure; make; make install" or even a "config.status" could get a nasty surprise.
+1. 2.1 is the right place to tweak module default values. And, it's also the place to remove modules entirely... 1.3 and 2.0 shouldn't change. -- justin