upstream/1.002+20111214.1

Martin Erik Werner

@arand-guest

c715668d · Imported Upstream version 1.002+20111214.1 · Dec 14, 2011

Upstream version 1.002+20111214.1