upstream/1.2-2011.11.16

Russ Allbery

@rra

46b6412a · Imported Upstream version 1.2-2011.11.16 · Jan 23, 2012

Upstream version 1.2-2011.11.16