Merge branch 'master' of git.osmocom.org:libosmocore
authorPablo Neira Ayuso <pablo@netfilter.org>
Mon, 23 May 2011 17:01:34 +0000 (19:01 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 23 May 2011 17:01:34 +0000 (19:01 +0200)

Trivial merge