Merge remote branch 'cvs/master'
commit9fcdd594e15eae4570f89aea0a0a3ee631711ce4
authorMichael J Gruber <locallink-owner@mozdev.org>
Mon, 23 Nov 2009 21:33:14 +0000 (23 22:33 +0100)
committerMichael J Gruber <locallink-owner@mozdev.org>
Mon, 23 Nov 2009 21:33:14 +0000 (23 22:33 +0100)
treeca80cebd75afd595616f6467c5e0f1ee31ce5733
parent24fecf36220b15b5cdf3814815d11adc531a21f1
parent4d33d608cc10a014afe1f30647e10ec0024bb280
Merge remote branch 'cvs/master'