merge of '2159dc39693944f0d5864c14aa1d9513f3cbefa0'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 28 Jul 2008 22:02:21 +0000 (22:02 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 28 Jul 2008 22:02:21 +0000 (22:02 +0000)
commit7b93a615d39e272bb87d7ed92340708d7f6d53f9
tree37d473bb40aac6fc758109b5c2f972cbb5a49165
parentf2b78d18a6a51a47fd009d781b0f8153fdea8269
parent229a71af3b74d388211eebd95769d0ade67ad00f
Merge ... '2159dc39693944f0d5864c14aa1d9513f3cbefa0'
     and 'd3210ecbfcc795109a513bb1c8bb6469047ed55d'