Put Trond's changes to lib-prefix back in. These, plus everything else finally seem to work.
Put Trond's changes to lib-prefix back in. These, plus everything else finally
seem to work.

dm/gearmand,beeksiwaais/gearmand,dm/gearmand,dm/gearmand,dm/gearmand,beeksiwaais/gearmand,beeksiwaais/gearmand,beeksiwaais/gearmand