upstream/20090908dfsg

Didier Raboud

@odyx

29a5d5be · Imported Upstream version 20090908dfsg · May 25, 2011

Upstream version 20090908dfsg