Merge remote branch 'cvs/master'
commitcd893e2d89851851fd9ff565dffa98a6102f0c8c
authorMichael J Gruber <locallink-owner@mozdev.org>
Mon, 30 Nov 2009 10:57:48 +0000 (30 11:57 +0100)
committerMichael J Gruber <locallink-owner@mozdev.org>
Mon, 30 Nov 2009 10:57:48 +0000 (30 11:57 +0100)
tree5b0083f36bc3890f7389700b4fe927f3ff180b1b
parent550b6f17783812066c11261334ac381607412523
parent6484221aebd5a43c59d032460f7a43ea976486c0
Merge remote branch 'cvs/master'