merge r16488
authorJo-Philipp Wich <[email protected]>
Wed, 17 Jun 2009 11:12:03 +0000 (11:12 +0000)
committerJo-Philipp Wich <[email protected]>
Wed, 17 Jun 2009 11:12:03 +0000 (11:12 +0000)
commit2e24db87605767ad33b2e2d3173fdfd56f059e81
tree13d4a6ca16fdee59e61fcdba905ccbd53fd09fc1
parent6627ede8796e485c6567a86af16c0d856c5701c7
merge r16488

SVN-Revision: 16489
package/base-files/Makefile
package/base-files/files/lib/upgrade/common.sh