Merge branch 'master' of git.osmocom.org:libosmocore
authorPablo Neira Ayuso <pablo@gnumonks.org>
Mon, 13 Jun 2011 17:15:50 +0000 (19:15 +0200)
committerPablo Neira Ayuso <pablo@gnumonks.org>
Mon, 13 Jun 2011 17:15:50 +0000 (19:15 +0200)

Trivial merge