[au1000] merge the two patches applying to the same file in a single patch