upstream/0.0.20100108
1f15666c · Merge commit 'egli/master' · Aug 25, 2009