Merge branch 'master' of git.osmocom.org:libosmocore
authorPablo Neira Ayuso <pablo@netfilter.org>
Tue, 24 May 2011 16:31:13 +0000 (18:31 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 24 May 2011 16:31:13 +0000 (18:31 +0200)

Trivial merge