Merge commit 'remotes/yangtse/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 7 Jan 2008 15:32:02 +0000 (16:32 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 7 Jan 2008 15:32:02 +0000 (16:32 +0100)
commit1ce6af6bcbef182148e6ae06d71f4caf053bd644
tree94a7a43086050f216ca8d3ef70951fcd60def5eb
parent9a4a139a9c57420e1bd4b96000985cbfa841782d
parent123ace95d32271900674b83872abbaad5024a885
Merge commit 'remotes/yangtse/master'