Merge branch 'master' into SLE11-SP1
authorMichal Marek <mmarek@suse.cz>
Tue, 12 Jan 2010 11:31:10 +0000 (12:31 +0100)
committerMichal Marek <mmarek@suse.cz>
Tue, 12 Jan 2010 11:31:10 +0000 (12:31 +0100)
commit3f501460b192d7bdc3c549275d024e115cd46233
tree7d8c8b4edf76cfb7b6a370237b721777b91e3699
parent4b088d4521cd409399b1c0915102185703027044
parent595451618bf6bbf19282c2c1026043cf2f32d9ad
Merge branch 'master' into SLE11-SP1

suse-commit: e55dc2b73dc1e1eabb3de0744f77fd728ec520a3