tree ee35661f4d94c26d71a5c329cf0a96d60fb1c58f
parent 590c39b2d9e2fdc4365f635323135ac6a8c8a287
parent cad370f083ff958603725e60e58b4df6c74b0fd8
author Holger Hans Peter Freyther <zecke@selfish.org> 1250495831 +0200
committer Holger Hans Peter Freyther <zecke@selfish.org> 1250495831 +0200

Merge branch 'holger/merge-msc-bsc-split'