merge r17674
authorJo-Philipp Wich <jow@openwrt.org>
Tue, 22 Sep 2009 15:08:13 +0000 (15:08 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Tue, 22 Sep 2009 15:08:13 +0000 (15:08 +0000)
commitf50f3193c2b63aa5cfc68d4823fa7bc3f8c8d096
treecbb43cc4dc498287540124a83b768b9fd9677c87
parentc1aa7213a403853a4a8c5f6b2ef9833209e513e3
merge r17674

SVN-Revision: 17675
scripts/combined-image.sh