merge of '77bc506750c82f6a414e7c64c175cdaa3dd4b0d5'
authorRobert Schuster <thebohemian@gmx.net>
Sun, 27 Jul 2008 15:37:34 +0000 (15:37 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Sun, 27 Jul 2008 15:37:34 +0000 (15:37 +0000)
commit576108f93e655ea83b09f28ab9307d99f4127a10
tree9501a9d813f0a6c06c53f3516bfe6e96e9ae4f37
parentd19bc258745eadadcad3220c4fd2f6eb319be511
parenta2d91ed512d248d832e385c40db6f31d0886dabe
Merge ... '77bc506750c82f6a414e7c64c175cdaa3dd4b0d5'
     and '7d59915b6a6897fd24467fd539404f8354fe0fa9'