Merge with master
commit600b147a7255e54cfeec4878711a835bac4628d5
authorWitold Filipczyk <witekfl@poczta.onet.pl>
Mon, 25 Dec 2006 12:42:50 +0000 (25 13:42 +0100)
committerWitold Filipczyk <nobody@nowhere>
Mon, 25 Dec 2006 12:42:50 +0000 (25 13:42 +0100)
tree4bde64ab9002687f3becdff1ecbfeb6aa088dc7a
parent87702bd491967fcee3cb3c3d0a406ee63107f389
parent6ce3546c51730491ce9ec36f7c371ceeb31ec8df
Merge with master