Imported Upstream version 1.0.2 + GIT 2012-11-29