Merge remote-tracking branch 'nulltoken/topic/oid-generation' into development Conflicts: tests-clay/clay.h tests-clay/clay_main.c
2011-12-14T03:32:49