Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Sun, 20 Dec 2009 18:49:55 +0000 (19:49 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 20 Dec 2009 18:49:55 +0000 (19:49 +0100)
commita694ab16b6ff43b545ccd530360b7224433a5b76
tree54a7cb74ab72dedbfe8ce725e32f915ed6200aad
parent780983923128f14e30cdd2ec07ca6e19262282b8
parent4ea3743c93e581954e9b1cf8ec7a10c38b35cfee
Merge branch 'maint'
audiod.c