e952c3b3b parent 437f8c8ab99e7b6eed8e0d6d9cf46085c8de2e36 parent 59fe4fe34d7afdf63208124f313be9056feaa2f4 author Len Brown 1249227264 -0400 committer Len Brown 1249227264 -0400 Merge branch 'thinkpad' into release kÔZZšCx