Merge commit 'jv/master'
authorPierre Habouzit <madcoder@debian.org>
Sat, 17 May 2008 13:47:02 +0000 (15:47 +0200)
committerPierre Habouzit <madcoder@debian.org>
Sat, 17 May 2008 13:47:02 +0000 (15:47 +0200)
1  2 
btslink.cfg

diff --cc btslink.cfg
Simple merge