Merge branch 'channel_list_mutex'
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 29 Apr 2010 10:57:21 +0000 (12:57 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 29 Apr 2010 10:57:21 +0000 (12:57 +0200)

Trivial merge