upstream/20111202dfsg0
f05a5d83 · Merge commit 'upstream/20111202' into upstream ·