merge r31271
authorJo-Philipp Wich <jow@openwrt.org>
Fri, 13 Apr 2012 10:49:23 +0000 (10:49 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Fri, 13 Apr 2012 10:49:23 +0000 (10:49 +0000)
commit1dafa7c88955e259808ccec6f7c3870dddd16040
treef991f32ba4f2671f19463493c35f96e811c64c3f
parent9a18c1b2f8f6312c134f9c4cbca92a53e73a74f8
merge r31271

SVN-Revision: 31272
include/version.mk
target/sdk/Makefile