Merge branch 'master' into tlv-mic
authorLuke Howard <lukeh@padl.com>
Tue, 19 Apr 2011 18:22:57 +0000 (20:22 +0200)
committerLuke Howard <lukeh@padl.com>
Tue, 19 Apr 2011 18:22:57 +0000 (20:22 +0200)
1  2 
util.h

diff --cc util.h
Simple merge