01-various-upstream-fixes-20120205.diff
