Merge branch 'mallard-to-merge'
authorFrédéric Péters <fpeters@0d.be>
Wed, 12 Aug 2009 16:40:34 +0000 (18:40 +0200)
committerFrédéric Péters <fpeters@0d.be>
Wed, 12 Aug 2009 16:40:34 +0000 (18:40 +0200)
commit1a4735d843a9d2757d73cdce9b0c2a0a2fb9d1b1
tree16ee21877e3ad47b08b2a1a1bdfdaeec09ef9146
parent03480a1e9b3e6886bef8346c4b73d8dd93b8e238
parent553761acd191a6879caab2a8943b5aae50f46290
Merge branch 'mallard-to-merge'