merge of 'a925a41dbe7a5d17f8081a8d5a761042750ef05c'
authorMatthias Hentges <oe@hentges.net>
Thu, 3 Jan 2008 23:30:54 +0000 (23:30 +0000)
committerMatthias Hentges <oe@hentges.net>
Thu, 3 Jan 2008 23:30:54 +0000 (23:30 +0000)
commit53138680c8a4abfbb788604430ef93f58d084cd9
treee38bc85f371121281f823d320ffab595380379af
parentc5c78c3746fa20932160ff585b3e4c53f4e6c69d
parentd85d9d55bd736f70b821ffce61db1b41b8aec2b5
Merge ... 'a925a41dbe7a5d17f8081a8d5a761042750ef05c'
     and 'abe0149045acae87e701ee34dbfee1ff0ebc71c9'