Code

Merge branch 'upstream-1.3' into experimental
authorSebastian Harl <sh@tokkee.org>
Wed, 23 Jul 2008 19:42:13 +0000 (21:42 +0200)
committerSebastian Harl <sh@tokkee.org>
Wed, 23 Jul 2008 19:42:13 +0000 (21:42 +0200)
commitbb80fbeb0fc8a57a7c3d84eb0b6bce5aa5e37ca7
tree81e8ce943d5b06aef568183db2d2f2ecf899d48e
parent9bf08c73f15aaa54bac779a1aa10233d062b81a9
parent33df5c014df769dddc6df97bb7071ad1afb3e4eb
Merge branch 'upstream-1.3' into experimental