Merge branch 'master' into SLE11-SP1
authorMichal Marek <mmarek@suse.cz>
Fri, 6 Nov 2009 10:32:48 +0000 (11:32 +0100)
committerMichal Marek <mmarek@suse.cz>
Fri, 6 Nov 2009 10:32:48 +0000 (11:32 +0100)
commit2475c35587720761bdcf8990003157fc3328066b
tree37d72b1c1e8ecacf72e2ad905ff3188acc0d858b
parent56f05a7e54915b6d129b5063695689905c9d7078
parentb3028fc73e2a391792f2f1a6a87b8d42e6dadde6
Merge branch 'master' into SLE11-SP1

Conflicts:
rpm/kernel-binary.spec.in

suse-commit: d6093693e0980717a6fafc3d9c1cc87cf10ad27f