Merge commit 'upstream/20090930' into dfsg_clean
commitde4734de5f6a0e5789d38c3568c2186066eacaed
authorJiri Palecek <jirka@debian.(none)>
Tue, 6 Oct 2009 21:38:47 +0000 (6 23:38 +0200)
committerJiri Palecek <jirka@debian.(none)>
Tue, 6 Oct 2009 21:38:47 +0000 (6 23:38 +0200)
tree6b5bdaf58da1d780690f8f046a3a1985a569c166
parent19b70dd2436eda58a975cc909ab288cccb2d1fe5
parent6f5e0f280c80858e02ce0ab7dcea036ccf647378
Merge commit 'upstream/20090930' into dfsg_clean

Conflicts:
configure
include/config.h.in