merge of '08b850dd4e1df4e1751532b79a9685dd41464df7'

     and 'e79716efdd36e7696ebd0ad656d58dbc0edd904c'

diff --cc packages/p4/p4.inc
index 3b8303f,5a0342f..9439f73
--- 1/packages/p4/p4.inc
--- 2/packages/p4/p4.inc
+++ b/packages/p4/p4.inc
@@@ -2,11 -2,18 +2,10 @@@
  # Copyright (C) 2006, Advanced Micro Devices, Inc.  All Rights Reserved
  # Released under the MIT license (see /COPYING)
  
 -HOMEPAGE = "http://www.perforce.com"
  DESCRIPTION = "Perforce client and server binaries"
- MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>"
 +HOMEPAGE = "http://www.perforce.com"
  LICENSE = "Perforce"
  
 -def get_kernelmajorversion(p):
 -      import re
 -      r = re.compile("([0-9]+\.[0-9]+).*")
 -      m = r.match(p);
 -      if m:
 -              return m.group(1)
 -      return None
 -
  def p4_arch(d):
        import bb, re
        arch = bb.data.getVar('TARGET_ARCH', d, 1)

diff --cc packages/tasks/task-bootstrap-unionroot.bb
Simple merge

diff --cc packages/tasks/task-bootstrap.bb
Simple merge