Merge branch 'stable' into dual_socket
authorHenning Rogge <hrogge@googlemail.com>
Sun, 13 Dec 2009 14:01:24 +0000 (15:01 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Sun, 13 Dec 2009 14:01:24 +0000 (15:01 +0100)
1  2 
src/interfaces.h
src/main.c

Simple merge
diff --cc src/main.c
Simple merge