Merge remote branch 'cvs/master'
commit2c6fe63074c3d77aab4cb92c4dc721a759f586a7
authorMichael J Gruber <aboutconfig-owner@mozdev.org>
Mon, 23 Nov 2009 20:18:20 +0000 (23 21:18 +0100)
committerMichael J Gruber <aboutconfig-owner@mozdev.org>
Mon, 23 Nov 2009 20:18:20 +0000 (23 21:18 +0100)
tree9b38b0bb18da5bbb0e903ce224e47ae71ae6c048
parentd79d213d3bcbb957f6555f0d6ddd94c39915dffc
parentaad9cf4901596f0e76d9f314147158f23427d17f
Merge remote branch 'cvs/master'