Merge commit 'upstream/1.3.3'
authorRuss Allbery <rra@debian.org>
Tue, 15 Dec 2009 03:08:49 +0000 (19:08 -0800)
committerRuss Allbery <rra@debian.org>
Tue, 15 Dec 2009 03:08:49 +0000 (19:08 -0800)
commitbabf4578f97246cc14223d20ef0c28966a4377e9
tree9525a2bc51fc6b4429750b1aec4ea6f408664afa
parentd477fbbce42292d8ece30007f7b9f15e841d42cd
parent7ea93b26ce63344342f45473ca9c8873f89d32d3
Merge commit 'upstream/1.3.3'