Merge commit 'origin/dev_work' into dev_home
commit24f4288158240b87714ef4749172dc0ed0d3aa22
authorMichael Rieger <mir@mircpu.(none)>
Mon, 26 May 2008 12:49:48 +0000 (26 14:49 +0200)
committerMichael Rieger <mir@mircpu.(none)>
Mon, 26 May 2008 12:49:48 +0000 (26 14:49 +0200)
treeb12ca3bf80326e4c1fafbebbe7e0f9ac2f8d043e
parenta4e7cb02b9d271d06e151a0520a04dc8430af3f8
parent65c804e86e8f6a718f746835bfd1282187c28d53
Merge commit 'origin/dev_work' into dev_home