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)
commitde0d4c7b5478e919058ae7938c54a0e0ed463bfa
tree5d51f10286b936c936dbbdd48a90d32f9b2183af
parentffd5cfc9721e3b9cb0794914df673c0c0b030ff0
parentc825cfee57f833fdc58ceadab0426cc324928704
Merge branch 'master' into tlv-mic
util.h