Merge commit 'remotes/yangtse/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 7 Jan 2008 16:21:21 +0000 (17:21 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 7 Jan 2008 16:21:21 +0000 (17:21 +0100)
commit695086cebfe6e44e61a6d11e64128c1f5d60fd4b
tree57229e510d764eb820df355211827e479457d1e6
parent1ce6af6bcbef182148e6ae06d71f4caf053bd644
parent0018d755c4a834704217464879bfd699d077664b
Merge commit 'remotes/yangtse/master'