Merge branch 'master' of molnam1@rtime.felk.cvut.cz:/var/git/frescor/frsh_forb

Conflicts:

	frsh_api/tests/Makefile.omk

diff --cc frsh_api/tests/Makefile.omk
index 706c26bf87076fd8479c59d2691d5772634dc979,ced16a3041eaf5f7a0fe816f1f8e3ec67f914214..5b377851b4e2799453b854ed7c7380e57b0e6930
--- 1/frsh_api/tests/Makefile.omk
--- 2/frsh_api/tests/Makefile.omk
+++ b/frsh_api/tests/Makefile.omk
@@@ -4,11 -4,11 +4,13 @@@ negotiation_SOURCES = negotiation.
  lib_LOADLIBES += pthread rt frsh 
  
  ifeq ($(CONFIG_FWP),y)
- test_PROGRAMS += distributed distributed2 fwpreceiver fwpsender
+ SUBDIRS= fwptest
+ 
+ test_PROGRAMS += distributed distributed2 
  distributed_SOURCES+= distributed.c
  distributed2_SOURCES+= distributed2.c
 +fwpreceiver_SOURCES+= fwpreceiver.c
 +fwpsender_SOURCES+= fwpsender.c
  lib_LOADLIBES += pthread rt fwp fna frsh
  endif