merge of '9c2f6fca7c62c837fc449c39821e20313450c4c3'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 19 Dec 2007 16:12:06 +0000 (16:12 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 19 Dec 2007 16:12:06 +0000 (16:12 +0000)
commitffa607e773edc24b09142452a7f3824d304c9599
tree104d84c37a6992901a4ae970bb1bd528ba0c815e
parent8673ba44db298d613cf3a1a1cabb403055857aef
parenta49cc157ed127a93a800dc8c0971f364933f03a4
Merge ... '9c2f6fca7c62c837fc449c39821e20313450c4c3'
     and 'd77c641ef66d10c52a010ef3dc1759f9f48016c4'