Merge commit 'upstream/20081031' into dfsg_clean
commit1e0d2c0a0f94f057af0dc5ac5bbfb4481b1f71bd
authorJiri Palecek <jirka@debian.(none)>
Fri, 31 Oct 2008 20:56:38 +0000 (31 21:56 +0100)
committerJiri Palecek <jirka@debian.(none)>
Fri, 31 Oct 2008 20:56:38 +0000 (31 21:56 +0100)
tree21b33d126c1fc423f29886fa8ef1a14c8ae07537
parenteb06f15967ae9b7c4f1b764748bfbab75fdadbec
parent279740f221911de06b08095b6159cba6b32733af
Merge commit 'upstream/20081031' into dfsg_clean