Merge commit 'upstream/0.3_20101226' into experimental
authorJulien Valroff <julien@kirya.net>
Sun, 26 Dec 2010 09:47:34 +0000 (10:47 +0100)
committerJulien Valroff <julien@kirya.net>
Sun, 26 Dec 2010 09:47:34 +0000 (10:47 +0100)
commitf833c8952abe5506017f6f881dd5b5367e45e190
treebad0d707a708ee2bbb5f2ea1e5f188a699bb6759
parentc8c6548eec3445bd3198dac88c4c2c86a079a805
parentd873c959e3a2bfcd18ca510939286b84efbd3a78
Merge commit 'upstream/0.3_20101226' into experimental