Merge from uaudio branch.
[disorder] / libtests / t-macros-2
1 wibble