Merge commit 'upstream/1.3'
authorRuss Allbery <rra@debian.org>
Fri, 6 Nov 2009 19:02:17 +0000 (11:02 -0800)
committerRuss Allbery <rra@debian.org>
Fri, 6 Nov 2009 19:02:17 +0000 (11:02 -0800)
commit46e0f296bf54c4cb3343b97a4cc5d11a77d96a36
tree87923ed5c441ae4be84669135fc333c8505ec8d6
parent880c16fe4d79754c3ffbdd5eefde6000e662098c
parent06fee3d836425274db1e38b73557988e8b12f942
Merge commit 'upstream/1.3'