Merge branch '609362'
authorBrandon Philips <bphilips@suse.de>
Thu, 3 Jun 2010 16:33:51 +0000 (09:33 -0700)
committerBrandon Philips <bphilips@suse.de>
Thu, 3 Jun 2010 16:33:51 +0000 (09:33 -0700)
commitc7e3f23edd3e8c5bf1b77b4ce1203d658d456839
treeb8f3b21a885a2e8e588545d8fba5cd9cf68edde7
parent04f916211b3580a435038a99fd30d6673aa3547f
parentc3397c1ba3d604905ffef53a6fa677b467019035
Merge branch '609362'

suse-commit: 5d1bde19645c8ade295b7e2c67b7af0e19e452c8