merge of '7ba62c1bc5f5f44c638e1e5f4805429a188ca3a6'
authorRobert Schuster <thebohemian@gmx.net>
Thu, 21 Aug 2008 15:44:29 +0000 (15:44 +0000)
committerRobert Schuster <thebohemian@gmx.net>
Thu, 21 Aug 2008 15:44:29 +0000 (15:44 +0000)
commit1a29e9f0e4f2b31e0c668b7a4daa6ca436119a10
tree2ac29c58a1d67ac30fe3aa3786f14d62d177d9ed
parentdd5d2d7643d4dab3b88d2fdf85df726c37af0982
parente295c6669417f74e0127fcce8a80627a1c042ef3
Merge ... '7ba62c1bc5f5f44c638e1e5f4805429a188ca3a6'
     and 'a211067fbce0623d7710d98f40f12ce3a2247ecf'