More bug #1077106 stuff, sorry -- modem induced impatiece!
This should go on whatever bugfix branches the other fetches up on.
M
Michael W. Hudson committed
faa7648ffe6fbc568eeb6457815bd85cef21bfbd
Parent: 9867ced
This should go on whatever bugfix branches the other fetches up on.