pull fixes from branch_1_1
authoraland <aland>
Sun, 26 Nov 2006 19:48:57 +0000 (19:48 +0000)
committeraland <aland>
Sun, 26 Nov 2006 19:48:57 +0000 (19:48 +0000)
commita6bb1680f926b47c0b3b4f8ac4654c87f050a03a
treeacb9632038985a987f90f7f592047161129f06ee
parent98735515efee1451f3f46db51e24cd257229a0ee
parent09d846c58c834c2f654d221299ec4097458fe406
pull fixes from branch_1_1