Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Sun, 31 Jan 2010 22:25:16 +0000 (23:25 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 31 Jan 2010 22:25:16 +0000 (23:25 +0100)
commit9609fd30e0d3db45ede3ab5c6bc3a77c15b6aef8
tree5ccd89058df78833d06db161dab0154a5c75c02c
parenta2fb56bdfa2726d401de8c1c3cd569ba96a5ccc3
parent70f527312e613fd89be88177dc2a44ad24b2d27c
Merge branch 'maint'

Conflicts:
recv_common.c
recv_common.c