Merge with branch 'master'
authorHannes Reinecke <hare@suse.de>
Fri, 10 Nov 2006 08:01:56 +0000 (09:01 +0100)
committerHannes Reinecke <hare@suse.de>
Fri, 10 Nov 2006 08:01:56 +0000 (09:01 +0100)
commit4de4d9cfdbbecdb858e3815bc49034d21b4bd906
tree480576a07759ec6f2d2a26db53237a3585e5be3a
parent609917771b8022c9d2d851e0711e1644a60b7252
parent9f0f3343d2a7ee7a93e9e99148bf669a22ad0d33
Merge with branch 'master'

Signed-off-by: Hannes Reinecke <hare@suse.de>